Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next

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

diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 4ad0c4f9171c18f4c7baa2cf1f253b1ea08af495..cdf599687cf7b1e4704fa213cf77961bb8f66cfd 100644 (file)
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -215,6 +215,7 @@ static void pch_gpio_setup(struct pch_gpio *chip)
        struct gpio_chip *gpio = &chip->gpio;
 
        gpio->label = dev_name(chip->dev);
+       gpio->dev = chip->dev;
        gpio->owner = THIS_MODULE;
        gpio->direction_input = pch_gpio_direction_input;
        gpio->get = pch_gpio_get;
@@ -325,7 +326,7 @@ static irqreturn_t pch_gpio_handler(int irq, void *dev_id)
        return ret;
 }
 
-static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
+static void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
                                unsigned int irq_start, unsigned int num)
 {
        struct irq_chip_generic *gc;
@@ -345,7 +346,7 @@ static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
 }
 
-static int __devinit pch_gpio_probe(struct pci_dev *pdev,
+static int pch_gpio_probe(struct pci_dev *pdev,
                                    const struct pci_device_id *id)
 {
        s32 ret;
@@ -442,7 +443,7 @@ err_pci_enable:
        return ret;
 }
 
-static void __devexit pch_gpio_remove(struct pci_dev *pdev)
+static void pch_gpio_remove(struct pci_dev *pdev)
 {
        int err;
        struct pch_gpio *chip = pci_get_drvdata(pdev);
@@ -531,7 +532,7 @@ static struct pci_driver pch_gpio_driver = {
        .name = "pch_gpio",
        .id_table = pch_gpio_pcidev_id,
        .probe = pch_gpio_probe,
-       .remove = __devexit_p(pch_gpio_remove),
+       .remove = pch_gpio_remove,
        .suspend = pch_gpio_suspend,
        .resume = pch_gpio_resume
 };