Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / gpio / gpio-vr41xx.c

diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index b2d05f3a8c9e7f770475c6f7dd80f3c3c9fe21e8..c1caa459c02da527f580f6b8445fdf4df28ce383 100644 (file)
--- 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)
 
 static unsigned int startup_giuint(struct irq_data *data)
 {
-       if (gpio_lock_as_irq(&vr41xx_gpio_chip, data->hwirq))
+       if (gpiochip_lock_as_irq(&vr41xx_gpio_chip, data->hwirq))
                dev_err(vr41xx_gpio_chip.dev,
                        "unable to lock HW IRQ %lu for IRQ\n",
                        data->hwirq);
@@ -150,7 +150,7 @@ static unsigned int startup_giuint(struct irq_data *data)
 static void shutdown_giuint(struct irq_data *data)
 {
        mask_giuint_low(data);
-       gpio_unlock_as_irq(&vr41xx_gpio_chip, data->hwirq);
+       gpiochip_unlock_as_irq(&vr41xx_gpio_chip, data->hwirq);
 }
 
 static struct irq_chip giuint_low_irq_chip = {