gpio: Get rid of duplicate of_node assignment in the drivers

GPIO library does copy the of_node from the parent device of
the GPIO chip, there is no need to repeat this in the individual
drivers. Remove these assignment all at once.

For the details one may look into the of_gpio_dev_init() implementation.

While at it, remove duplicate parent device assignment where it is the case.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-By: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index 8eedfc6..cc349d4 100644 (file)
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -458,7 +458,6 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios,
        chip->ngpio = num_gpios;
        chip->label = adnp->client->name;
        chip->parent = &adnp->client->dev;
-       chip->of_node = chip->parent->of_node;
        chip->owner = THIS_MODULE;
 
        if (is_irq_controller) {

diff --git a/drivers/gpio/gpio-amdpt.c b/drivers/gpio/gpio-amdpt.c
index 13f4e2a..8cfb353 100644 (file)
--- a/drivers/gpio/gpio-amdpt.c
+++ b/drivers/gpio/gpio-amdpt.c
@@ -105,9 +105,7 @@ static int pt_gpio_probe(struct platform_device *pdev)
        pt_gpio->gc.request          = pt_gpio_request;
        pt_gpio->gc.free             = pt_gpio_free;
        pt_gpio->gc.ngpio            = (uintptr_t)device_get_match_data(dev);
-#if defined(CONFIG_OF_GPIO)
-       pt_gpio->gc.of_node          = dev->of_node;
-#endif
+
        ret = gpiochip_add_data(&pt_gpio->gc, pt_gpio);
        if (ret) {
                dev_err(dev, "Failed to register GPIO lib\n");

diff --git a/drivers/gpio/gpio-bd71828.c b/drivers/gpio/gpio-bd71828.c
index c8e382b..b2ccc32 100644 (file)
--- a/drivers/gpio/gpio-bd71828.c
+++ b/drivers/gpio/gpio-bd71828.c
@@ -121,7 +121,6 @@ static int bd71828_probe(struct platform_device *pdev)
         * "gpio-reserved-ranges" and exclude them from control
         */
        bdgpio->gpio.ngpio = 4;
-       bdgpio->gpio.of_node = dev->parent->of_node;
        bdgpio->regmap = dev_get_regmap(dev->parent, NULL);
        if (!bdgpio->regmap)
                return -ENODEV;

diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index 895a799..176c264 100644 (file)
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -703,7 +703,6 @@ static int brcmstb_gpio_probe(struct platform_device *pdev)
                        goto fail;
                }
 
-               gc->of_node = np;
                gc->owner = THIS_MODULE;
                gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", dev->of_node);
                if (!gc->label) {

diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index cb5afaa..f960587 100644 (file)
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -254,7 +254,6 @@ static int davinci_gpio_probe(struct platform_device *pdev)
 #ifdef CONFIG_OF_GPIO
        chips->chip.of_gpio_n_cells = 2;
        chips->chip.parent = dev;
-       chips->chip.of_node = dev->of_node;
        chips->chip.request = gpiochip_generic_request;
        chips->chip.free = gpiochip_generic_free;
 #endif

diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c
index 865ab2b..8d722e0 100644 (file)
--- a/drivers/gpio/gpio-eic-sprd.c
+++ b/drivers/gpio/gpio-eic-sprd.c
@@ -609,7 +609,6 @@ static int sprd_eic_probe(struct platform_device *pdev)
        sprd_eic->chip.ngpio = pdata->num_eics;
        sprd_eic->chip.base = -1;
        sprd_eic->chip.parent = &pdev->dev;
-       sprd_eic->chip.of_node = pdev->dev.of_node;
        sprd_eic->chip.direction_input = sprd_eic_direction_input;
        switch (sprd_eic->type) {
        case SPRD_EIC_DEBOUNCE:

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index 90b336e..858e6eb 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -306,7 +306,6 @@ static int em_gio_probe(struct platform_device *pdev)
        }
 
        gpio_chip = &p->gpio_chip;
-       gpio_chip->of_node = dev->of_node;
        gpio_chip->direction_input = em_gio_direction_input;
        gpio_chip->get = em_gio_get;
        gpio_chip->direction_output = em_gio_direction_output;

diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c
index 6369527..f6a3de9 100644 (file)
--- a/drivers/gpio/gpio-ge.c
+++ b/drivers/gpio/gpio-ge.c
@@ -82,7 +82,6 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
        gc->base = -1;
        gc->ngpio = (u16)(uintptr_t)of_device_get_match_data(&pdev->dev);
        gc->of_gpio_n_cells = 2;
-       gc->of_node = pdev->dev.of_node;
 
        /* This function adds a memory mapped GPIO chip */
        ret = devm_gpiochip_add_data(&pdev->dev, gc, NULL);

diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c
index f954359..23d447e 100644 (file)
--- a/drivers/gpio/gpio-grgpio.c
+++ b/drivers/gpio/gpio-grgpio.c
@@ -358,7 +358,6 @@ static int grgpio_probe(struct platform_device *ofdev)
        priv->imask = gc->read_reg(regs + GRGPIO_IMASK);
        priv->dev = &ofdev->dev;
 
-       gc->of_node = np;
        gc->owner = THIS_MODULE;
        gc->to_irq = grgpio_to_irq;
        gc->label = devm_kasprintf(&ofdev->dev, GFP_KERNEL, "%pOF", np);

diff --git a/drivers/gpio/gpio-gw-pld.c b/drivers/gpio/gpio-gw-pld.c
index 242112f..77a3fbd 100644 (file)
--- a/drivers/gpio/gpio-gw-pld.c
+++ b/drivers/gpio/gpio-gw-pld.c
@@ -82,7 +82,6 @@ static int gw_pld_probe(struct i2c_client *client,
        gw->chip.base = -1;
        gw->chip.can_sleep = true;
        gw->chip.parent = dev;
-       gw->chip.of_node = np;
        gw->chip.owner = THIS_MODULE;
        gw->chip.label = dev_name(dev);
        gw->chip.ngpio = 8;

diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
index c3658a5..52b49e7 100644 (file)
--- a/drivers/gpio/gpio-mt7621.c
+++ b/drivers/gpio/gpio-mt7621.c
@@ -217,7 +217,6 @@ mediatek_gpio_bank_probe(struct device *dev,
        memset(rg, 0, sizeof(*rg));
 
        spin_lock_init(&rg->lock);
-       rg->chip.of_node = node;
        rg->bank = bank;
 
        dat = mtk->base + GPIO_REG_DATA + (rg->bank * GPIO_BANK_STRIDE);

diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 8f429d9..4c1f9e1 100644 (file)
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -1183,7 +1183,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
        mvchip->chip.base = id * MVEBU_MAX_GPIO_PER_BANK;
        mvchip->chip.ngpio = ngpios;
        mvchip->chip.can_sleep = false;
-       mvchip->chip.of_node = np;
        mvchip->chip.dbg_show = mvebu_gpio_dbg_show;
 
        if (soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K)

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 415e8df..e099c39 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1419,9 +1419,6 @@ static int omap_gpio_probe(struct platform_device *pdev)
        bank->is_mpuio = pdata->is_mpuio;
        bank->non_wakeup_gpios = pdata->non_wakeup_gpios;
        bank->regs = pdata->regs;
-#ifdef CONFIG_OF_GPIO
-       bank->chip.of_node = of_node_get(node);
-#endif
 
        if (node) {
                if (!of_property_read_bool(node, "ti,gpio-always-on"))

diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c
index e8e9029..bac10c2 100644 (file)
--- a/drivers/gpio/gpio-palmas.c
+++ b/drivers/gpio/gpio-palmas.c
@@ -170,9 +170,7 @@ static int palmas_gpio_probe(struct platform_device *pdev)
        palmas_gpio->gpio_chip.set      = palmas_gpio_set;
        palmas_gpio->gpio_chip.get      = palmas_gpio_get;
        palmas_gpio->gpio_chip.parent = &pdev->dev;
-#ifdef CONFIG_OF_GPIO
-       palmas_gpio->gpio_chip.of_node = pdev->dev.of_node;
-#endif
+
        palmas_pdata = dev_get_platdata(palmas->dev);
        if (palmas_pdata && palmas_pdata->gpio_base)
                palmas_gpio->gpio_chip.base = palmas_pdata->gpio_base;

diff --git a/drivers/gpio/gpio-pmic-eic-sprd.c b/drivers/gpio/gpio-pmic-eic-sprd.c
index 9382851..e518490 100644 (file)
--- a/drivers/gpio/gpio-pmic-eic-sprd.c
+++ b/drivers/gpio/gpio-pmic-eic-sprd.c
@@ -331,7 +331,6 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev)
        pmic_eic->chip.ngpio = SPRD_PMIC_EIC_NR;
        pmic_eic->chip.base = -1;
        pmic_eic->chip.parent = &pdev->dev;
-       pmic_eic->chip.of_node = pdev->dev.of_node;
        pmic_eic->chip.direction_input = sprd_pmic_eic_direction_input;
        pmic_eic->chip.request = sprd_pmic_eic_request;
        pmic_eic->chip.free = sprd_pmic_eic_free;

diff --git a/drivers/gpio/gpio-raspberrypi-exp.c b/drivers/gpio/gpio-raspberrypi-exp.c
index 64a552e..3c414e0 100644 (file)
--- a/drivers/gpio/gpio-raspberrypi-exp.c
+++ b/drivers/gpio/gpio-raspberrypi-exp.c
@@ -221,7 +221,6 @@ static int rpi_exp_gpio_probe(struct platform_device *pdev)
        rpi_gpio->gc.parent = dev;
        rpi_gpio->gc.label = MODULE_NAME;
        rpi_gpio->gc.owner = THIS_MODULE;
-       rpi_gpio->gc.of_node = np;
        rpi_gpio->gc.base = -1;
        rpi_gpio->gc.ngpio = NUM_GPIO;
 

diff --git a/drivers/gpio/gpio-rda.c b/drivers/gpio/gpio-rda.c
index 4638464..0d03f52 100644 (file)
--- a/drivers/gpio/gpio-rda.c
+++ b/drivers/gpio/gpio-rda.c
@@ -240,8 +240,6 @@ static int rda_gpio_probe(struct platform_device *pdev)
        rda_gpio->chip.label = dev_name(dev);
        rda_gpio->chip.ngpio = ngpios;
        rda_gpio->chip.base = -1;
-       rda_gpio->chip.parent = dev;
-       rda_gpio->chip.of_node = np;
 
        if (rda_gpio->irq >= 0) {
                rda_gpio->irq_chip.name = "rda-gpio",

diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
index c1b8e5d..a4c4e45 100644 (file)
--- a/drivers/gpio/gpio-rockchip.c
+++ b/drivers/gpio/gpio-rockchip.c
@@ -584,9 +584,6 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank)
        gc->ngpio = bank->nr_pins;
        gc->label = bank->name;
        gc->parent = bank->dev;
-#ifdef CONFIG_OF_GPIO
-       gc->of_node = of_node_get(bank->of_node);
-#endif
 
        ret = gpiochip_add_data(gc, bank);
        if (ret) {

diff --git a/drivers/gpio/gpio-sama5d2-piobu.c b/drivers/gpio/gpio-sama5d2-piobu.c
index b7c9506..3e95da7 100644 (file)
--- a/drivers/gpio/gpio-sama5d2-piobu.c
+++ b/drivers/gpio/gpio-sama5d2-piobu.c
@@ -192,7 +192,6 @@ static int sama5d2_piobu_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, piobu);
        piobu->chip.label = pdev->name;
        piobu->chip.parent = &pdev->dev;
-       piobu->chip.of_node = pdev->dev.of_node;
        piobu->chip.owner = THIS_MODULE,
        piobu->chip.get_direction = sama5d2_piobu_get_direction,
        piobu->chip.direction_input = sama5d2_piobu_direction_input,

diff --git a/drivers/gpio/gpio-sprd.c b/drivers/gpio/gpio-sprd.c
index 9dd9dab..9bff639 100644 (file)
--- a/drivers/gpio/gpio-sprd.c
+++ b/drivers/gpio/gpio-sprd.c
@@ -237,7 +237,6 @@ static int sprd_gpio_probe(struct platform_device *pdev)
        sprd_gpio->chip.ngpio = SPRD_GPIO_NR;
        sprd_gpio->chip.base = -1;
        sprd_gpio->chip.parent = &pdev->dev;
-       sprd_gpio->chip.of_node = pdev->dev.of_node;
        sprd_gpio->chip.request = sprd_gpio_request;
        sprd_gpio->chip.free = sprd_gpio_free;
        sprd_gpio->chip.get = sprd_gpio_get;

diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
index dd4d58b..0fa4f0a 100644 (file)
--- a/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@ -477,7 +477,6 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
        stmpe_gpio->chip = template_chip;
        stmpe_gpio->chip.ngpio = stmpe->num_gpios;
        stmpe_gpio->chip.parent = &pdev->dev;
-       stmpe_gpio->chip.of_node = np;
        stmpe_gpio->chip.base = -1;
 
        if (IS_ENABLED(CONFIG_DEBUG_FS))

diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 8d15849..443fe97 100644 (file)
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -319,7 +319,6 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
        tc3589x_gpio->chip.ngpio = tc3589x->num_gpio;
        tc3589x_gpio->chip.parent = &pdev->dev;
        tc3589x_gpio->chip.base = -1;
-       tc3589x_gpio->chip.of_node = np;
 
        girq = &tc3589x_gpio->chip.irq;
        girq->chip = &tc3589x_gpio_irq_chip;

diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
index 91c77fc..ce892c8 100644 (file)
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@ -749,7 +749,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
        gpio->gpio.names = (const char * const *)names;
 
 #if defined(CONFIG_OF_GPIO)
-       gpio->gpio.of_node = pdev->dev.of_node;
        gpio->gpio.of_gpio_n_cells = 2;
        gpio->gpio.of_xlate = tegra186_gpio_of_xlate;
 #endif /* CONFIG_OF_GPIO */

diff --git a/drivers/gpio/gpio-tps65218.c b/drivers/gpio/gpio-tps65218.c
index 912382b..e1d425a 100644 (file)
--- a/drivers/gpio/gpio-tps65218.c
+++ b/drivers/gpio/gpio-tps65218.c
@@ -196,9 +196,6 @@ static int tps65218_gpio_probe(struct platform_device *pdev)
        tps65218_gpio->tps65218 = tps65218;
        tps65218_gpio->gpio_chip = template_chip;
        tps65218_gpio->gpio_chip.parent = &pdev->dev;
-#ifdef CONFIG_OF_GPIO
-       tps65218_gpio->gpio_chip.of_node = pdev->dev.of_node;
-#endif
 
        return devm_gpiochip_add_data(&pdev->dev, &tps65218_gpio->gpio_chip,
                                      tps65218_gpio);

diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index e0f2b67..20780c3 100644 (file)
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -298,7 +298,6 @@ static int vf610_gpio_probe(struct platform_device *pdev)
        }
 
        gc = &port->gc;
-       gc->of_node = np;
        gc->parent = dev;
        gc->label = "vf610-gpio";
        gc->ngpio = VF610_GPIO_PER_PORT;