Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-tegra.c

diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 4e8fb8261a8754cdfee323adad33d7218e951444..1741981d53c8fc2e9565e54d10f29ecf6552a7c7 100644 (file)
--- 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)
                return -EINVAL;
        }
 
-       ret = gpio_lock_as_irq(&tegra_gpio_chip, gpio);
+       ret = gpiochip_lock_as_irq(&tegra_gpio_chip, gpio);
        if (ret) {
                dev_err(dev, "unable to lock Tegra GPIO %d as IRQ\n", gpio);
                return ret;
@@ -263,7 +263,7 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d)
 {
        int gpio = d->hwirq;
 
-       gpio_unlock_as_irq(&tegra_gpio_chip, gpio);
+       gpiochip_unlock_as_irq(&tegra_gpio_chip, gpio);
 }
 
 static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
@@ -528,7 +528,6 @@ static int tegra_gpio_probe(struct platform_device *pdev)
 static struct platform_driver tegra_gpio_driver = {
        .driver         = {
                .name   = "tegra-gpio",
-               .owner  = THIS_MODULE,
                .pm     = &tegra_gpio_pm_ops,
                .of_match_table = tegra_gpio_of_match,
        },