Revert "input: touch: maxim_sti: Shutdown safely"
Bo Kim [Mon, 14 Oct 2013 08:15:53 +0000 (17:15 +0900)]
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 <bok@nvidia.com>
Reviewed-on: http://git-master/r/298916
(cherry picked from commit 52d61d13335287dba7e4b37406ba2b62eb05caf4)
Reviewed-on: http://git-master/r/327437
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>

drivers/input/touchscreen/maxim_sti.c

index 23910d6..bc7af34 100644 (file)
@@ -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);