Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dmitry Torokhov and committed by
Arnd Bergmann
e1d8f312 a2ef9261

-30
-9
arch/mips/alchemy/devboards/db1300.c
··· 732 732 /**********************************************************************/ 733 733 734 734 #if IS_ENABLED(CONFIG_TOUCHSCREEN_WM97XX) 735 - static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable) 736 - { 737 - if (enable) 738 - enable_irq(DB1300_AC97_PEN_INT); 739 - else 740 - disable_irq_nosync(DB1300_AC97_PEN_INT); 741 - } 742 - 743 735 static struct wm97xx_mach_ops db1300_wm97xx_ops = { 744 - .irq_enable = db1300_wm97xx_irqen, 745 736 .irq_gpio = WM97XX_GPIO_3, 746 737 }; 747 738
-9
drivers/input/touchscreen/mainstone-wm97xx.c
··· 246 246 } 247 247 } 248 248 249 - static void wm97xx_irq_enable(struct wm97xx *wm, int enable) 250 - { 251 - if (enable) 252 - enable_irq(wm->pen_irq); 253 - else 254 - disable_irq_nosync(wm->pen_irq); 255 - } 256 - 257 249 static struct wm97xx_mach_ops mainstone_mach_ops = { 258 250 .acc_enabled = 1, 259 251 .acc_pen_up = wm97xx_acc_pen_up, 260 252 .acc_pen_down = wm97xx_acc_pen_down, 261 253 .acc_startup = wm97xx_acc_startup, 262 254 .acc_shutdown = wm97xx_acc_shutdown, 263 - .irq_enable = wm97xx_irq_enable, 264 255 .irq_gpio = WM97XX_GPIO_2, 265 256 }; 266 257
-9
drivers/input/touchscreen/zylonite-wm97xx.c
··· 160 160 return 0; 161 161 } 162 162 163 - static void wm97xx_irq_enable(struct wm97xx *wm, int enable) 164 - { 165 - if (enable) 166 - enable_irq(wm->pen_irq); 167 - else 168 - disable_irq_nosync(wm->pen_irq); 169 - } 170 - 171 163 static struct wm97xx_mach_ops zylonite_mach_ops = { 172 164 .acc_enabled = 1, 173 165 .acc_pen_up = wm97xx_acc_pen_up, 174 166 .acc_pen_down = wm97xx_acc_pen_down, 175 167 .acc_startup = wm97xx_acc_startup, 176 - .irq_enable = wm97xx_irq_enable, 177 168 .irq_gpio = WM97XX_GPIO_2, 178 169 }; 179 170
-3
include/linux/wm97xx.h
··· 254 254 int (*acc_startup) (struct wm97xx *); 255 255 void (*acc_shutdown) (struct wm97xx *); 256 256 257 - /* interrupt mask control - required for accelerated operation */ 258 - void (*irq_enable) (struct wm97xx *, int enable); 259 - 260 257 /* GPIO pin used for accelerated operation */ 261 258 int irq_gpio; 262 259