Input: wm97xx - get rid of irq_enable method in wm97xx_mach_ops

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

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
[arnd: add the db1300 change as well]
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index cd72eaa1168f70c1415d663d1f01795dacb30b0c..e70e529ddd914d0ff98e3452df6560505860c79f 100644 (file)
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -732,16 +732,7 @@ static struct platform_device db1300_lcd_dev = {
 /**********************************************************************/
 
 #if IS_ENABLED(CONFIG_TOUCHSCREEN_WM97XX)
-static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable)
-{
-       if (enable)
-               enable_irq(DB1300_AC97_PEN_INT);
-       else
-               disable_irq_nosync(DB1300_AC97_PEN_INT);
-}
-
 static struct wm97xx_mach_ops db1300_wm97xx_ops = {
-       .irq_enable     = db1300_wm97xx_irqen,
        .irq_gpio       = WM97XX_GPIO_3,
 };
 

diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index 8f6fe68f1f992cddaa7f9d855f92b8538c03ffdd..c39f49720fe461a7adabe63a784261ecefe69d37 100644 (file)
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -246,21 +246,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 ed7eae638713ae9ed8d607e9040ecd642c8c6a13..a70fe4abe52065fb6bff3e341f544c17d96edf94 100644 (file)
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -160,20 +160,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 85bd8dd3caeaf5684a7dfd9325917958b205e62a..332d2b0f29b993a14ad2e51a8e03991bed5e356c 100644 (file)
--- 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;