From 52d61d13335287dba7e4b37406ba2b62eb05caf4 Mon Sep 17 00:00:00 2001 From: Bo Kim Date: Mon, 14 Oct 2013 17:15:53 +0900 Subject: Revert "input: touch: maxim_sti: Shutdown safely" This reverts commit 87de1d533241169695c552e837f024208d98c670. The latest maxim release processes shutdown as well. Conflicts: drivers/input/touchscreen/maxim_sti.c Change-Id: Ic6b506c873a98413bc5bb51dd2d2e79019177622 Signed-off-by: Bo Kim Reviewed-on: http://git-master/r/298916 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Gabby Lee --- drivers/input/touchscreen/maxim_sti.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index bab77b8e5f34..aaaaf1535f10 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -1836,12 +1836,6 @@ static int remove(struct spi_device *spi) INFO("removing...\n"); - if (dd->irq_registered) - disable_irq(dd->spi->irq); - - dd->nl_enabled = false; - (void)kthread_stop(dd->thread); - if (dd->fusion_process != (pid_t)0) (void)kill_pid(find_get_pid(dd->fusion_process), SIGKILL, 1); @@ -1891,17 +1885,6 @@ static void shutdown(struct spi_device *spi) INFO("doing shutdown...\n"); - if (dd->irq_registered) - disable_irq(dd->spi->irq); - - dd->nl_enabled = false; - (void)kthread_stop(dd->thread); - - if (dd->fusion_process != (pid_t)0) - (void)kill_pid(find_get_pid(dd->fusion_process), SIGKILL, 1); - - stop_scan_canned(dd); - pdata->reset(pdata, 0); usleep_range(100, 120); regulator_control(dd, false); -- cgit v1.2.3