aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-vr41xx.c
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2014-10-23 04:27:07 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-10-28 12:30:59 -0400
commite3a2e87893125bcd99bd7e1ddf9bfc421e492572 (patch)
tree725e03df58827c8eca35ffb787f43921c55046b2 /drivers/gpio/gpio-vr41xx.c
parentee2a9f7f06a5bff86cf3468fe74bf504640cf5e6 (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-vr41xx.c')
-rw-r--r--drivers/gpio/gpio-vr41xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index dbf28fa03f67..cec55226143d 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -138,7 +138,7 @@ static void unmask_giuint_low(struct irq_data *d)
138 138
139static unsigned int startup_giuint(struct irq_data *data) 139static unsigned int startup_giuint(struct irq_data *data)
140{ 140{
141 if (gpio_lock_as_irq(&vr41xx_gpio_chip, data->hwirq)) 141 if (gpiochip_lock_as_irq(&vr41xx_gpio_chip, data->hwirq))
142 dev_err(vr41xx_gpio_chip.dev, 142 dev_err(vr41xx_gpio_chip.dev,
143 "unable to lock HW IRQ %lu for IRQ\n", 143 "unable to lock HW IRQ %lu for IRQ\n",
144 data->hwirq); 144 data->hwirq);
@@ -150,7 +150,7 @@ static unsigned int startup_giuint(struct irq_data *data)
150static void shutdown_giuint(struct irq_data *data) 150static void shutdown_giuint(struct irq_data *data)
151{ 151{
152 mask_giuint_low(data); 152 mask_giuint_low(data);
153 gpio_unlock_as_irq(&vr41xx_gpio_chip, data->hwirq); 153 gpiochip_unlock_as_irq(&vr41xx_gpio_chip, data->hwirq);
154} 154}
155 155
156static struct irq_chip giuint_low_irq_chip = { 156static struct irq_chip giuint_low_irq_chip = {