pinctrl: 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.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211214125855.33207-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/actions/pinctrl-owl.c b/drivers/pinctrl/actions/pinctrl-owl.c
index 781f2200ed5891a2cf1c8115cf7d2d11a5d809eb..ed46abc15d720ef53891a4c542426d709621d6e8 100644 (file)
--- a/drivers/pinctrl/actions/pinctrl-owl.c
+++ b/drivers/pinctrl/actions/pinctrl-owl.c
@@ -874,7 +874,6 @@ static int owl_gpio_init(struct owl_pinctrl *pctrl)
        chip->label = dev_name(pctrl->dev);
        chip->parent = pctrl->dev;
        chip->owner = THIS_MODULE;
-       chip->of_node = pctrl->dev->of_node;
 
        pctrl->irq_chip.name = chip->of_node->name;
        pctrl->irq_chip.irq_ack = owl_gpio_irq_ack;

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index d8cacdaf1476e964a1db1fa972817c587f656047..ae8b6ad2ea513f7a540f3185819315efed752110 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -1228,7 +1228,6 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
 
        pc->gpio_chip = *pdata->gpio_chip;
        pc->gpio_chip.parent = dev;
-       pc->gpio_chip.of_node = np;
 
        for (i = 0; i < BCM2835_NUM_BANKS; i++) {
                unsigned long events;

diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
index a7a0dd638a26b31792b75e6c070b72d245215b94..52fa2f4cd618f8ec424df9150368a9cef87a93bf 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
@@ -836,7 +836,6 @@ static int iproc_gpio_probe(struct platform_device *pdev)
        chip->num_banks = (ngpios + NGPIOS_PER_BANK - 1) / NGPIOS_PER_BANK;
        gc->label = dev_name(dev);
        gc->parent = dev;
-       gc->of_node = dev->of_node;
        gc->request = iproc_gpio_request;
        gc->free = iproc_gpio_free;
        gc->direction_input = iproc_gpio_direction_input;

diff --git a/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c b/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c
index e03142895f61ae7d07421aafbb11fc5d4446d1da..643dbd315033cc1a51b975a82b6d31d7f93858f1 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c
@@ -648,7 +648,6 @@ static int nsp_gpio_probe(struct platform_device *pdev)
        gc->ngpio = val;
        gc->label = dev_name(dev);
        gc->parent = dev;
-       gc->of_node = dev->of_node;
        gc->request = gpiochip_generic_request;
        gc->free = gpiochip_generic_free;
        gc->direction_input = nsp_gpio_direction_input;

diff --git a/drivers/pinctrl/cirrus/pinctrl-lochnagar.c b/drivers/pinctrl/cirrus/pinctrl-lochnagar.c
index 670ac53a3141a3c8cf953522258ae1ce1ffa7765..3fda4446d70ba725f3d49c2cf69f15df1aafc3ad 100644 (file)
--- a/drivers/pinctrl/cirrus/pinctrl-lochnagar.c
+++ b/drivers/pinctrl/cirrus/pinctrl-lochnagar.c
@@ -1161,9 +1161,6 @@ static int lochnagar_pin_probe(struct platform_device *pdev)
        priv->gpio_chip.can_sleep = true;
        priv->gpio_chip.parent = dev;
        priv->gpio_chip.base = -1;
-#ifdef CONFIG_OF_GPIO
-       priv->gpio_chip.of_node = dev->of_node;
-#endif
 
        switch (lochnagar->type) {
        case LOCHNAGAR1:

diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
index ad3b6716397352f8e02c96c1381ed51192573a86..5bfaa84839c7eb8c17df1b3407dacc7bc0f78107 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-moore.c
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
@@ -519,7 +519,7 @@ static int mtk_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
        return mtk_eint_set_debounce(hw->eint, desc->eint.eint_n, debounce);
 }
 
-static int mtk_build_gpiochip(struct mtk_pinctrl *hw, struct device_node *np)
+static int mtk_build_gpiochip(struct mtk_pinctrl *hw)
 {
        struct gpio_chip *chip = &hw->chip;
        int ret;
@@ -536,7 +536,6 @@ static int mtk_build_gpiochip(struct mtk_pinctrl *hw, struct device_node *np)
        chip->set_config        = mtk_gpio_set_config;
        chip->base              = -1;
        chip->ngpio             = hw->soc->npins;
-       chip->of_node           = np;
        chip->of_gpio_n_cells   = 2;
 
        ret = gpiochip_add_data(chip, hw);
@@ -550,7 +549,7 @@ static int mtk_build_gpiochip(struct mtk_pinctrl *hw, struct device_node *np)
         * Documentation/devicetree/bindings/gpio/gpio.txt on how to
         * bind pinctrl and gpio drivers via the "gpio-ranges" property.
         */
-       if (!of_find_property(np, "gpio-ranges", NULL)) {
+       if (!of_find_property(hw->dev->of_node, "gpio-ranges", NULL)) {
                ret = gpiochip_add_pin_range(chip, dev_name(hw->dev), 0, 0,
                                             chip->ngpio);
                if (ret < 0) {
@@ -691,7 +690,7 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
                         "Failed to add EINT, but pinctrl still can work\n");
 
        /* Build gpiochip should be after pinctrl_enable is done */
-       err = mtk_build_gpiochip(hw, pdev->dev.of_node);
+       err = mtk_build_gpiochip(hw);
        if (err) {
                dev_err(&pdev->dev, "Failed to add gpio_chip\n");
                return err;

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 4c6f6d967b18a6dac98a392b3826839307f34bdd..f9f9110f2107d0ea1c40bc5876128478c738fd15 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -895,7 +895,7 @@ static int mtk_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
        return mtk_eint_set_debounce(hw->eint, desc->eint.eint_n, debounce);
 }
 
-static int mtk_build_gpiochip(struct mtk_pinctrl *hw, struct device_node *np)
+static int mtk_build_gpiochip(struct mtk_pinctrl *hw)
 {
        struct gpio_chip *chip = &hw->chip;
        int ret;
@@ -913,7 +913,6 @@ static int mtk_build_gpiochip(struct mtk_pinctrl *hw, struct device_node *np)
        chip->set_config        = mtk_gpio_set_config;
        chip->base              = -1;
        chip->ngpio             = hw->soc->npins;
-       chip->of_node           = np;
        chip->of_gpio_n_cells   = 2;
 
        ret = gpiochip_add_data(chip, hw);
@@ -1037,7 +1036,7 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
                         "Failed to add EINT, but pinctrl still can work\n");
 
        /* Build gpiochip should be after pinctrl_enable is done */
-       err = mtk_build_gpiochip(hw, pdev->dev.of_node);
+       err = mtk_build_gpiochip(hw);
        if (err) {
                dev_err(&pdev->dev, "Failed to add gpio_chip\n");
                return err;

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index ecab9064a8458504fc96b34420bb83fdf1c92e19..1a7d686494ffbd26f2eefde41d69630bd496c27b 100644 (file)
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -1009,9 +1009,6 @@ static int amd_gpio_probe(struct platform_device *pdev)
        gpio_dev->gc.owner                      = THIS_MODULE;
        gpio_dev->gc.parent                     = &pdev->dev;
        gpio_dev->gc.ngpio                      = resource_size(res) / 4;
-#if defined(CONFIG_OF_GPIO)
-       gpio_dev->gc.of_node                    = pdev->dev.of_node;
-#endif
 
        gpio_dev->hwbank_num = gpio_dev->gc.ngpio / 64;
        gpio_dev->groups = kerncz_groups;

diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 03c32b2c5d303315733acc1abb3e779f21d65bee..fafd1f55cba781b70e5cd055971e362dc0e3506f 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1136,7 +1136,6 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
        }
 
        atmel_pioctrl->gpio_chip = &atmel_gpio_chip;
-       atmel_pioctrl->gpio_chip->of_node = dev->of_node;
        atmel_pioctrl->gpio_chip->ngpio = atmel_pioctrl->npins;
        atmel_pioctrl->gpio_chip->label = dev_name(dev);
        atmel_pioctrl->gpio_chip->parent = dev;

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 6022496bb6a98854be2d194fd6454f36543d2f25..d91a010e65f5c5272980fd05c1382e8a36a9f2e0 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1868,7 +1868,6 @@ static int at91_gpio_probe(struct platform_device *pdev)
        at91_chip->chip = at91_gpio_template;
 
        chip = &at91_chip->chip;
-       chip->of_node = np;
        chip->label = dev_name(&pdev->dev);
        chip->parent = &pdev->dev;
        chip->owner = THIS_MODULE;

diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c
index ff702cfbaa28af9083665d054a7f4f26d0ec6428..cc3546fc461021b62ebfd182c5cca2a9b90f7781 100644 (file)
--- a/drivers/pinctrl/pinctrl-digicolor.c
+++ b/drivers/pinctrl/pinctrl-digicolor.c
@@ -233,7 +233,7 @@ static void dc_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
        spin_unlock_irqrestore(&pmap->lock, flags);
 }
 
-static int dc_gpiochip_add(struct dc_pinmap *pmap, struct device_node *np)
+static int dc_gpiochip_add(struct dc_pinmap *pmap)
 {
        struct gpio_chip *chip = &pmap->chip;
        int ret;
@@ -248,7 +248,6 @@ static int dc_gpiochip_add(struct dc_pinmap *pmap, struct device_node *np)
        chip->set               = dc_gpio_set;
        chip->base              = -1;
        chip->ngpio             = PINS_COUNT;
-       chip->of_node           = np;
        chip->of_gpio_n_cells   = 2;
 
        spin_lock_init(&pmap->lock);
@@ -326,7 +325,7 @@ static int dc_pinctrl_probe(struct platform_device *pdev)
                return PTR_ERR(pmap->pctl);
        }
 
-       return dc_gpiochip_add(pmap, pdev->dev.of_node);
+       return dc_gpiochip_add(pmap);
 }
 
 static const struct of_device_id dc_pinctrl_ids[] = {

diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index bccebe43dd6a958c243caf5bd87a5f0c3e7fd22f..695236636d05779a252368e8296e4df3ceff778d 100644 (file)
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -551,7 +551,6 @@ int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
        mcp->chip.set = mcp23s08_set;
 #ifdef CONFIG_OF_GPIO
        mcp->chip.of_gpio_n_cells = 2;
-       mcp->chip.of_node = dev->of_node;
 #endif
 
        mcp->chip.base = base;

diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
index 42aab9ba049abe63729a5a9904d3bd632c8a76cf..fc969208d904c4cb5f5cad246f8be36b0bbee5b5 100644 (file)
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -1748,7 +1748,6 @@ static int ocelot_gpiochip_register(struct platform_device *pdev,
        gc->ngpio = info->desc->npins;
        gc->parent = &pdev->dev;
        gc->base = -1;
-       gc->of_node = info->dev->of_node;
        gc->label = "ocelot-gpio";
 
        irq = irq_of_parse_and_map(gc->of_node, 0);

diff --git a/drivers/pinctrl/pinctrl-oxnas.c b/drivers/pinctrl/pinctrl-oxnas.c
index cebd810bd6d1f09a33299fe7b20dd2407bda7c65..fb10a8473ebeac773086cab518d7d17ad828ba49 100644 (file)
--- a/drivers/pinctrl/pinctrl-oxnas.c
+++ b/drivers/pinctrl/pinctrl-oxnas.c
@@ -1232,7 +1232,6 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
 
        bank->id = id;
        bank->gpio_chip.parent = &pdev->dev;
-       bank->gpio_chip.of_node = np;
        bank->gpio_chip.ngpio = ngpios;
        girq = &bank->gpio_chip.irq;
        girq->chip = &bank->irq_chip;

diff --git a/drivers/pinctrl/pinctrl-pic32.c b/drivers/pinctrl/pinctrl-pic32.c
index 748dabd8db6e820ca92fcc126c46c8a790bd5928..37acfdfc2cae07b9e97812b1aaa16dabc85d56db 100644 (file)
--- a/drivers/pinctrl/pinctrl-pic32.c
+++ b/drivers/pinctrl/pinctrl-pic32.c
@@ -2241,7 +2241,7 @@ static int pic32_gpio_probe(struct platform_device *pdev)
        }
 
        bank->gpio_chip.parent = &pdev->dev;
-       bank->gpio_chip.of_node = np;
+
        girq = &bank->gpio_chip.irq;
        girq->chip = &bank->irq_chip;
        girq->parent_handler = pic32_gpio_irq_handler;

diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index 5fa2488fae87ae037529340991278120c970c523..ab4dde40d3ed42f73a907ae75f2e8f1798af7038 100644 (file)
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -675,7 +675,6 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
        pctl->gpio_chip.base = -1;
        pctl->gpio_chip.ngpio = pctl->pctl_desc.npins;
        pctl->gpio_chip.can_sleep = true;
-       pctl->gpio_chip.of_node = np;
 
        pctl->irq_chip.name = dev_name(pctl->dev);
        pctl->irq_chip.irq_mask = stmfx_pinctrl_irq_mask;

diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
index 484a3b9e875c19b49ec7d24f8c9af298344dfe47..a87ea3b95cf476213b0ff46a8c2ea9d80ce80f3a 100644 (file)
--- a/drivers/pinctrl/pinctrl-sx150x.c
+++ b/drivers/pinctrl/pinctrl-sx150x.c
@@ -1163,9 +1163,6 @@ static int sx150x_probe(struct i2c_client *client,
        pctl->gpio.set = sx150x_gpio_set;
        pctl->gpio.set_config = gpiochip_generic_config;
        pctl->gpio.parent = dev;
-#ifdef CONFIG_OF_GPIO
-       pctl->gpio.of_node = dev->of_node;
-#endif
        pctl->gpio.can_sleep = true;
        pctl->gpio.label = devm_kstrdup(dev, client->name, GFP_KERNEL);
        if (!pctl->gpio.label)

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index 5e3f31b55eb7abdbd668eae444fd4c8ca8c988c8..3a03beb8a755736091982be9ec233ddce3c9f824 100644 (file)
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -1763,7 +1763,6 @@ static int pinmux_xway_probe(struct platform_device *pdev)
        /* register the gpio chip */
        xway_chip.parent = &pdev->dev;
        xway_chip.owner = THIS_MODULE;
-       xway_chip.of_node = pdev->dev.of_node;
        ret = devm_gpiochip_add_data(&pdev->dev, &xway_chip, NULL);
        if (ret) {
                dev_err(&pdev->dev, "Failed to register gpio chip\n");

diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index ae09e2dd8a5064313d88ff2f8398c97d186d6757..780878dede9e02628b477fe1d4ea921ceaf5fbe1 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -1264,7 +1264,6 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
        chip->label = dev_name(pctrl->dev);
        chip->parent = pctrl->dev;
        chip->owner = THIS_MODULE;
-       chip->of_node = pctrl->dev->of_node;
        if (msm_gpio_needs_valid_mask(pctrl))
                chip->init_valid_mask = msm_gpio_init_valid_mask;
 

diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
index b5949f766a7adde7f477f107e2c20573741676b4..1b41adda81295e1d2657d15275851e72aeebfb6f 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
@@ -773,7 +773,6 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev)
        pctrl->chip = pm8xxx_gpio_template;
        pctrl->chip.base = -1;
        pctrl->chip.parent = &pdev->dev;
-       pctrl->chip.of_node = pdev->dev.of_node;
        pctrl->chip.of_gpio_n_cells = 2;
        pctrl->chip.label = dev_name(pctrl->dev);
        pctrl->chip.ngpio = pctrl->npins;

diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
index 842940594c4a995e5076d15e96e866526507e256..49893a5133a85db5969231413a4d18326ba86a83 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
@@ -857,7 +857,6 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
        pctrl->chip = pm8xxx_mpp_template;
        pctrl->chip.base = -1;
        pctrl->chip.parent = &pdev->dev;
-       pctrl->chip.of_node = pdev->dev.of_node;
        pctrl->chip.of_gpio_n_cells = 2;
        pctrl->chip.label = dev_name(pctrl->dev);
        pctrl->chip.ngpio = pctrl->npins;

diff --git a/drivers/pinctrl/renesas/pinctrl-rza2.c b/drivers/pinctrl/renesas/pinctrl-rza2.c
index 32829eb9656c9d31f3d144ebee911b1ba5bf93c5..c0a04f1ee994ef039c76a08419b0537b745f2b2c 100644 (file)
--- a/drivers/pinctrl/renesas/pinctrl-rza2.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza2.c
@@ -240,7 +240,6 @@ static int rza2_gpio_register(struct rza2_pinctrl_priv *priv)
        int ret;
 
        chip.label = devm_kasprintf(priv->dev, GFP_KERNEL, "%pOFn", np);
-       chip.of_node = np;
        chip.parent = priv->dev;
        chip.ngpio = priv->npins;
 

diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c
index b36449724f3f25c72ee7b8eedf8eaf7b82851e92..ada401ef4342695b5920fe83263203d36c45f105 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-plgpio.c
+++ b/drivers/pinctrl/spear/pinctrl-plgpio.c
@@ -581,7 +581,6 @@ static int plgpio_probe(struct platform_device *pdev)
        plgpio->chip.label = dev_name(&pdev->dev);
        plgpio->chip.parent = &pdev->dev;
        plgpio->chip.owner = THIS_MODULE;
-       plgpio->chip.of_node = pdev->dev.of_node;
 
        if (!IS_ERR(plgpio->clk)) {
                ret = clk_prepare(plgpio->clk);

diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index 65b97e240196d3e94cd9629287b89ba7b77f24a5..6fac30de1c6a884985b5ec891a7eef3f76920a80 100644 (file)
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -565,7 +565,6 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
 
        data->gpio_chip = wmt_gpio_chip;
        data->gpio_chip.parent = &pdev->dev;
-       data->gpio_chip.of_node = pdev->dev.of_node;
        data->gpio_chip.ngpio = data->nbanks * 32;
 
        platform_set_drvdata(pdev, data);