diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-04 11:10:51 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2009-12-13 13:21:39 -0500 |
commit | 5a65edbc12b6b34ef912114f1fc8215786f85b25 (patch) | |
tree | ffe43bd1234b52ad1c3774b096a51594aabe49ad /drivers/mfd/wm8350-irq.c | |
parent | b9f96b5dcb1e2a75d142e481b77805ffdc6ccea6 (diff) |
mfd: Convert wm8350 IRQ handlers to irq_handler_t
This is done as simple code transformation, the semantics of the
IRQ API provided by the core are are still very different to those
of genirq (mainly with regard to masking).
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/wm8350-irq.c')
-rw-r--r-- | drivers/mfd/wm8350-irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c index d9abfc94c685..2ea2b8b4c72a 100644 --- a/drivers/mfd/wm8350-irq.c +++ b/drivers/mfd/wm8350-irq.c | |||
@@ -371,7 +371,7 @@ static void wm8350_irq_call_handler(struct wm8350 *wm8350, int irq) | |||
371 | mutex_lock(&wm8350->irq_mutex); | 371 | mutex_lock(&wm8350->irq_mutex); |
372 | 372 | ||
373 | if (wm8350->irq[irq].handler) | 373 | if (wm8350->irq[irq].handler) |
374 | wm8350->irq[irq].handler(wm8350, irq, wm8350->irq[irq].data); | 374 | wm8350->irq[irq].handler(irq, wm8350->irq[irq].data); |
375 | else { | 375 | else { |
376 | dev_err(wm8350->dev, "irq %d nobody cared. now masked.\n", | 376 | dev_err(wm8350->dev, "irq %d nobody cared. now masked.\n", |
377 | irq); | 377 | irq); |
@@ -431,8 +431,8 @@ static irqreturn_t wm8350_irq(int irq, void *irq_data) | |||
431 | } | 431 | } |
432 | 432 | ||
433 | int wm8350_register_irq(struct wm8350 *wm8350, int irq, | 433 | int wm8350_register_irq(struct wm8350 *wm8350, int irq, |
434 | void (*handler) (struct wm8350 *, int, void *), | 434 | irq_handler_t handler, unsigned long flags, |
435 | void *data) | 435 | const char *name, void *data) |
436 | { | 436 | { |
437 | if (irq < 0 || irq > WM8350_NUM_IRQ || !handler) | 437 | if (irq < 0 || irq > WM8350_NUM_IRQ || !handler) |
438 | return -EINVAL; | 438 | return -EINVAL; |