Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[cascardo/linux.git] / drivers / pinctrl / pinctrl-at91.c

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 66db984..dfd021e 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1471,7 +1471,7 @@ static unsigned int gpio_irq_startup(struct irq_data *d)
        unsigned        pin = d->hwirq;
        int ret;
 
-       ret = gpio_lock_as_irq(&at91_gpio->chip, pin);
+       ret = gpiochip_lock_as_irq(&at91_gpio->chip, pin);
        if (ret) {
                dev_err(at91_gpio->chip.dev, "unable to lock pind %lu IRQ\n",
                        d->hwirq);
@@ -1487,7 +1487,7 @@ static void gpio_irq_shutdown(struct irq_data *d)
        unsigned        pin = d->hwirq;
 
        gpio_irq_mask(d);
-       gpio_unlock_as_irq(&at91_gpio->chip, pin);
+       gpiochip_unlock_as_irq(&at91_gpio->chip, pin);
 }
 
 #ifdef CONFIG_PM
@@ -1831,7 +1831,6 @@ err:
 static struct platform_driver at91_gpio_driver = {
        .driver = {
                .name = "gpio-at91",
-               .owner = THIS_MODULE,
                .of_match_table = at91_gpio_of_match,
        },
        .probe = at91_gpio_probe,
@@ -1840,7 +1839,6 @@ static struct platform_driver at91_gpio_driver = {
 static struct platform_driver at91_pinctrl_driver = {
        .driver = {
                .name = "pinctrl-at91",
-               .owner = THIS_MODULE,
                .of_match_table = at91_pinctrl_of_match,
        },
        .probe = at91_pinctrl_probe,