mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

mfd: wm8994: Update to fully use irq_domain

Browse source 
Take advantage of the new regmap irq_domain support to dynamically
allocate interrupts, using regmap_irq_get_virq() rather than irq_base
to look up the interrupts. This means that most users should not need
to specify an irq_base at all.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark Brown 2012-05-13 11:03:26 +01:00
parent 022f926a24
commit 6550334f96
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/mfd/wm8994-irq.c
View file

@ -147,12 +147,6 @@ int wm8994_irq_init(struct wm8994 *wm8994)
return 0; return 0;
} }
if (!wm8994->irq_base) {
dev_err(wm8994->dev,
"No interrupt base specified, no interrupts\n");
return 0;
}
ret = regmap_add_irq_chip(wm8994->regmap, wm8994->irq, ret = regmap_add_irq_chip(wm8994->regmap, wm8994->irq,
IRQF_TRIGGER_HIGH | IRQF_ONESHOT, IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
wm8994->irq_base, &wm8994_irq_chip, wm8994->irq_base, &wm8994_irq_chip,

12
include/linux/mfd/wm8994/core.h
View file

@ -17,6 +17,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/regmap.h>
enum wm8994_type { enum wm8994_type {
WM8994 = 0, WM8994 = 0,
@ -26,7 +27,6 @@ enum wm8994_type {
struct regulator_dev; struct regulator_dev;
struct regulator_bulk_data; struct regulator_bulk_data;
struct regmap;
#define WM8994_NUM_GPIO_REGS 11 #define WM8994_NUM_GPIO_REGS 11
#define WM8994_NUM_LDO_REGS 2 #define WM8994_NUM_LDO_REGS 2
@ -94,17 +94,17 @@ static inline int wm8994_request_irq(struct wm8994 *wm8994, int irq,
irq_handler_t handler, const char *name, irq_handler_t handler, const char *name,
void *data) void *data)
{ {
if (!wm8994->irq_base) if (!wm8994->irq_data)
return -EINVAL; return -EINVAL;
return request_threaded_irq(wm8994->irq_base + irq, NULL, handler, return request_threaded_irq(regmap_irq_get_virq(wm8994->irq_data, irq),
IRQF_TRIGGER_RISING, name, NULL, handler, IRQF_TRIGGER_RISING, name,
data); data);
} }
static inline void wm8994_free_irq(struct wm8994 *wm8994, int irq, void *data) static inline void wm8994_free_irq(struct wm8994 *wm8994, int irq, void *data)
{ {
if (!wm8994->irq_base) if (!wm8994->irq_data)
return; return;
free_irq(wm8994->irq_base + irq, data); free_irq(regmap_irq_get_virq(wm8994->irq_data, irq), data);
} }
int wm8994_irq_init(struct wm8994 *wm8994); int wm8994_irq_init(struct wm8994 *wm8994);