aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-tegra.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-tegra.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-tegra.c')
-rw-r--r--drivers/gpio/gpio-tegra.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 4e8fb8261a87..61bcfa93606d 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -233,7 +233,7 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type)
233 return -EINVAL; 233 return -EINVAL;
234 } 234 }
235 235
236 ret = gpio_lock_as_irq(&tegra_gpio_chip, gpio); 236 ret = gpiochip_lock_as_irq(&tegra_gpio_chip, gpio);
237 if (ret) { 237 if (ret) {
238 dev_err(dev, "unable to lock Tegra GPIO %d as IRQ\n", gpio); 238 dev_err(dev, "unable to lock Tegra GPIO %d as IRQ\n", gpio);
239 return ret; 239 return ret;
@@ -263,7 +263,7 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d)
263{ 263{
264 int gpio = d->hwirq; 264 int gpio = d->hwirq;
265 265
266 gpio_unlock_as_irq(&tegra_gpio_chip, gpio); 266 gpiochip_unlock_as_irq(&tegra_gpio_chip, gpio);
267} 267}
268 268
269static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) 269static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)