Revert "Revert "Revert "input: touch: maxim_sti: Shutdown safely"""
David Jung [Wed, 13 Nov 2013 21:48:11 +0000 (13:48 -0800)]
This reverts commit 7a44e63b7af9e134958fa8777f8df333b4c90269.

Bug 1404490

Change-Id: Id12842e727ec627f0e756aa7cbcdf515ff29da74
Signed-off-by: David Jung <djung@nvidia.com>
Reviewed-on: http://git-master/r/330675
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>

drivers/input/touchscreen/maxim_sti.c

index ed19380..f1f4b3f 100644 (file)
@@ -1877,12 +1877,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);
 
@@ -1930,17 +1924,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);