Input: wm97xx - switch to using threaded IRQ
Subsystems (3)
Dmitry Torokhov
maintainerPATCH 1/2 Input: wm97xx - switch to using threaded IRQ
Instead of manually disabling and enabling interrupts and scheduling work to access the device, let's use threaded oneshot interrupt handler. It simplifies things.
Signed-off-by Dmitry Torokhov <[email protected]>
---
drivers/input/touchscreen/wm97xx-core.c | 42 +++++-------------------- include/linux/wm97xx.h | 1 - 2 files changed, 7 insertions(+), 36 deletions(-)
drivers/input/touchscreen/wm97xx-core.c +7 -35
@@ -285,11 +285,12 @@ void wm97xx_set_suspend_mode(struct wm97xx *wm, u16 mode)EXPORT_SYMBOL_GPL (wm97xx_set_suspend_mode);/* -* Handle a pen down interrupt. +* Codec PENDOWN irq handler +* */ -static void wm97xx_pen_irq_worker (struct work_struct *work) +static irqreturn_t wm97xx_pen_interrupt (int irq,void *dev_id) { - struct wm97xx *wm = container_of(work, struct wm97xx, pen_event_work); +struct wm97xx *wm = dev_id;int pen_was_down = wm->pen_is_down;/* do we need to enable the touch panel reader */
@@ -343,27 +344,6 @@ static void wm97xx_pen_irq_worker(struct work_struct *work)if (!wm->pen_is_down && wm->mach_ops->acc_enabled) wm->mach_ops->acc_pen_up (wm); - wm->mach_ops->irq_enable (wm,1 ); -} - -/* -* Codec PENDOWN irq handler -* -* We have to disable the codec interrupt in the handler because it -* can take up to 1ms to clear the interrupt source. We schedule a task -* in a work queue to do the actual interaction with the chip. The -* interrupt is then enabled again in the slow handler when the source -* has been cleared. -*/ -static irqreturn_t wm97xx_pen_interrupt (int irq,void *dev_id) -{ -struct wm97xx *wm = dev_id; - -if (!work_pending (&wm->pen_event_work)) { - wm->mach_ops->irq_enable (wm,0 ); -queue_work (wm->ts_workq, &wm->pen_event_work); - } -return IRQ_HANDLED ; }
@@ -374,12 +354,9 @@ static int wm97xx_init_pen_irq(struct wm97xx *wm) {u16 reg; -/* If an interrupt is supplied an IRQ enable operation must also be -* provided. */ -BUG_ON (!wm->mach_ops->irq_enable); - -if (request_irq (wm->pen_irq, wm97xx_pen_interrupt,IRQF_SHARED , -"wm97xx-pen" , wm)) { +if (request_threaded_irq (wm->pen_irq,NULL , wm97xx_pen_interrupt, +IRQF_SHARED |IRQF_ONESHOT , +"wm97xx-pen" , wm)) {dev_err (wm->dev,"Failed to register pen down interrupt, polling" ); wm->pen_irq =0 ;
@@ -509,7 +486,6 @@ static int wm97xx_ts_input_open(struct input_dev *idev) wm->codec->dig_enable (wm,1 );INIT_DELAYED_WORK (&wm->ts_reader, wm97xx_ts_reader); -INIT_WORK (&wm->pen_event_work, wm97xx_pen_irq_worker); wm->ts_reader_min_interval =HZ >=100 ?HZ /100 :1 ;if (wm->ts_reader_min_interval <1 )
@@ -560,10 +536,6 @@ static void wm97xx_ts_input_close(struct input_dev *idev) wm->pen_is_down =0 ; -/* Balance out interrupt disables/enables */ -if (cancel_work_sync (&wm->pen_event_work)) - wm->mach_ops->irq_enable (wm,1 ); -/* ts_reader rearms itself so we need to explicitly stop it * before we destroy the workqueue. */
include/linux/wm97xx.h +0 -1
@@ -281,7 +281,6 @@ struct wm97xx {unsigned long ts_reader_min_interval;/* Minimum interval */ unsigned int pen_irq;/* Pen IRQ number in use */ struct workqueue_struct *ts_workq; -struct work_struct pen_event_work;u16 acc_slot;/* AC97 slot used for acc touch data */ u16 acc_rate;/* acc touch data rate */ unsigned pen_is_down:1; /* Pen is down */
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Dmitry Torokhov
maintainerPATCH 2/2 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 <[email protected]>
---
drivers/input/touchscreen/mainstone-wm97xx.c | 9 --------- drivers/input/touchscreen/zylonite-wm97xx.c | 9 --------- include/linux/wm97xx.h | 3 --- 3 files changed, 21 deletions(-)
drivers/input/touchscreen/mainstone-wm97xx.c +0 -9
@@ -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 , };
drivers/input/touchscreen/zylonite-wm97xx.c +0 -9
@@ -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 , };
include/linux/wm97xx.h +0 -3
@@ -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;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog