[PATCH 2/2] Input: wm97xx - get rid of irq_enable method in wm97xx_mach_ops

[Dmitry Torokhov]

Now that we are using oneshot threaded IRQ this method is not used anymore.

Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>

---

 drivers/input/touchscreen/mainstone-wm97xx.c | 9 ---------
 drivers/input/touchscreen/zylonite-wm97xx.c  | 9 ---------
 include/linux/wm97xx.h                       | 3 ---
 3 files changed, 21 deletions(-)

diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c 
b/drivers/input/touchscreen/mainstone-wm97xx.c
index f8564b398eb3..72b62a00b11a 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -256,21 +256,12 @@ static void wm97xx_acc_shutdown(struct wm97xx *wm)
        }
 }
 
-static void wm97xx_irq_enable(struct wm97xx *wm, int enable)
-{
-       if (enable)
-               enable_irq(wm->pen_irq);
-       else
-               disable_irq_nosync(wm->pen_irq);
-}
-
 static struct wm97xx_mach_ops mainstone_mach_ops = {
        .acc_enabled = 1,
        .acc_pen_up = wm97xx_acc_pen_up,
        .acc_pen_down = wm97xx_acc_pen_down,
        .acc_startup = wm97xx_acc_startup,
        .acc_shutdown = wm97xx_acc_shutdown,
-       .irq_enable = wm97xx_irq_enable,
        .irq_gpio = WM97XX_GPIO_2,
 };
 
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c 
b/drivers/input/touchscreen/zylonite-wm97xx.c
index 0f4ac7f844ce..23d09b1cb339 100644
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -161,20 +161,11 @@ static int wm97xx_acc_startup(struct wm97xx *wm)
        return 0;
 }
 
-static void wm97xx_irq_enable(struct wm97xx *wm, int enable)
-{
-       if (enable)
-               enable_irq(wm->pen_irq);
-       else
-               disable_irq_nosync(wm->pen_irq);
-}
-
 static struct wm97xx_mach_ops zylonite_mach_ops = {
        .acc_enabled    = 1,
        .acc_pen_up     = wm97xx_acc_pen_up,
        .acc_pen_down   = wm97xx_acc_pen_down,
        .acc_startup    = wm97xx_acc_startup,
-       .irq_enable     = wm97xx_irq_enable,
        .irq_gpio       = WM97XX_GPIO_2,
 };
 
diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h
index 7d5496fa6ac7..43bfb9589aab 100644
--- a/include/linux/wm97xx.h
+++ b/include/linux/wm97xx.h
@@ -254,9 +254,6 @@ struct wm97xx_mach_ops {
        int (*acc_startup) (struct wm97xx *);
        void (*acc_shutdown) (struct wm97xx *);
 
-       /* interrupt mask control - required for accelerated operation */
-       void (*irq_enable) (struct wm97xx *, int enable);
-
        /* GPIO pin used for accelerated operation */
        int irq_gpio;
 
-- 
2.23.0.866.gb869b98d4c-goog