diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-03 13:40:19 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-07-12 13:40:13 +0200 |
| commit | 224a1f90458b5005fa7aec5e8a6d64fd8eccb208 (patch) | |
| tree | 03eefee6d514db5ce2acd924f93eacb820f8de17 /drivers/gpio/gpio-wm8994.c | |
| parent | f942a7de047d8c599cc1a9a26293c8c7400450ea (diff) | |
| download | kernel_goldelico_gta04-224a1f90458b5005fa7aec5e8a6d64fd8eccb208.zip kernel_goldelico_gta04-224a1f90458b5005fa7aec5e8a6d64fd8eccb208.tar.gz kernel_goldelico_gta04-224a1f90458b5005fa7aec5e8a6d64fd8eccb208.tar.bz2 | |
gpiolib: wm8994: Use irq_domain mappings for gpios
This has no practical impact at present since we don't support device tree
so any user must have set an irq_base but this will in future allow a
transition to device tree with minimal invasiveness.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-wm8994.c')
| -rw-r--r-- | drivers/gpio/gpio-wm8994.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c index 92ea535..a1c7ba9 100644 --- a/drivers/gpio/gpio-wm8994.c +++ b/drivers/gpio/gpio-wm8994.c @@ -19,6 +19,7 @@ #include <linux/mfd/core.h> #include <linux/platform_device.h> #include <linux/seq_file.h> +#include <linux/regmap.h> #include <linux/mfd/wm8994/core.h> #include <linux/mfd/wm8994/pdata.h> @@ -109,10 +110,7 @@ static int wm8994_gpio_to_irq(struct gpio_chip *chip, unsigned offset) struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip); struct wm8994 *wm8994 = wm8994_gpio->wm8994; - if (!wm8994->irq_base) - return -EINVAL; - - return wm8994->irq_base + offset; + return regmap_irq_get_virq(wm8994->irq_data, offset); } |