diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2014-10-23 04:27:07 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-10-28 12:30:59 -0400 |
commit | e3a2e87893125bcd99bd7e1ddf9bfc421e492572 (patch) | |
tree | 725e03df58827c8eca35ffb787f43921c55046b2 /drivers/gpio/gpio-em.c | |
parent | ee2a9f7f06a5bff86cf3468fe74bf504640cf5e6 (diff) |
gpio: rename gpio_lock_as_irq to gpiochip_lock_as_irq
This function actually operates on a gpio_chip, so its prefix should
reflect that fact for consistency with other functions defined in
gpio/driver.h.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-em.c')
-rw-r--r-- | drivers/gpio/gpio-em.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index fe49ec3cdb7d..21d34d4d473d 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c | |||
@@ -103,7 +103,7 @@ static int em_gio_irq_reqres(struct irq_data *d) | |||
103 | { | 103 | { |
104 | struct em_gio_priv *p = irq_data_get_irq_chip_data(d); | 104 | struct em_gio_priv *p = irq_data_get_irq_chip_data(d); |
105 | 105 | ||
106 | if (gpio_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) { | 106 | if (gpiochip_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) { |
107 | dev_err(p->gpio_chip.dev, | 107 | dev_err(p->gpio_chip.dev, |
108 | "unable to lock HW IRQ %lu for IRQ\n", | 108 | "unable to lock HW IRQ %lu for IRQ\n", |
109 | irqd_to_hwirq(d)); | 109 | irqd_to_hwirq(d)); |
@@ -116,7 +116,7 @@ static void em_gio_irq_relres(struct irq_data *d) | |||
116 | { | 116 | { |
117 | struct em_gio_priv *p = irq_data_get_irq_chip_data(d); | 117 | struct em_gio_priv *p = irq_data_get_irq_chip_data(d); |
118 | 118 | ||
119 | gpio_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d)); | 119 | gpiochip_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d)); |
120 | } | 120 | } |
121 | 121 | ||
122 | 122 | ||