Commit 448cf905 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-By: default avatarMatti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent ca7e7822
...@@ -458,7 +458,6 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios, ...@@ -458,7 +458,6 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios,
chip->ngpio = num_gpios; chip->ngpio = num_gpios;
chip->label = adnp->client->name; chip->label = adnp->client->name;
chip->parent = &adnp->client->dev; chip->parent = &adnp->client->dev;
chip->of_node = chip->parent->of_node;
chip->owner = THIS_MODULE; chip->owner = THIS_MODULE;
if (is_irq_controller) { if (is_irq_controller) {
......
...@@ -105,9 +105,7 @@ static int pt_gpio_probe(struct platform_device *pdev) ...@@ -105,9 +105,7 @@ static int pt_gpio_probe(struct platform_device *pdev)
pt_gpio->gc.request = pt_gpio_request; pt_gpio->gc.request = pt_gpio_request;
pt_gpio->gc.free = pt_gpio_free; pt_gpio->gc.free = pt_gpio_free;
pt_gpio->gc.ngpio = (uintptr_t)device_get_match_data(dev); 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); ret = gpiochip_add_data(&pt_gpio->gc, pt_gpio);
if (ret) { if (ret) {
dev_err(dev, "Failed to register GPIO lib\n"); dev_err(dev, "Failed to register GPIO lib\n");
......
...@@ -121,7 +121,6 @@ static int bd71828_probe(struct platform_device *pdev) ...@@ -121,7 +121,6 @@ static int bd71828_probe(struct platform_device *pdev)
* "gpio-reserved-ranges" and exclude them from control * "gpio-reserved-ranges" and exclude them from control
*/ */
bdgpio->gpio.ngpio = 4; bdgpio->gpio.ngpio = 4;
bdgpio->gpio.of_node = dev->parent->of_node;
bdgpio->regmap = dev_get_regmap(dev->parent, NULL); bdgpio->regmap = dev_get_regmap(dev->parent, NULL);
if (!bdgpio->regmap) if (!bdgpio->regmap)
return -ENODEV; return -ENODEV;
......
...@@ -703,7 +703,6 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) ...@@ -703,7 +703,6 @@ static int brcmstb_gpio_probe(struct platform_device *pdev)
goto fail; goto fail;
} }
gc->of_node = np;
gc->owner = THIS_MODULE; gc->owner = THIS_MODULE;
gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", dev->of_node); gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", dev->of_node);
if (!gc->label) { if (!gc->label) {
......
...@@ -254,7 +254,6 @@ static int davinci_gpio_probe(struct platform_device *pdev) ...@@ -254,7 +254,6 @@ static int davinci_gpio_probe(struct platform_device *pdev)
#ifdef CONFIG_OF_GPIO #ifdef CONFIG_OF_GPIO
chips->chip.of_gpio_n_cells = 2; chips->chip.of_gpio_n_cells = 2;
chips->chip.parent = dev; chips->chip.parent = dev;
chips->chip.of_node = dev->of_node;
chips->chip.request = gpiochip_generic_request; chips->chip.request = gpiochip_generic_request;
chips->chip.free = gpiochip_generic_free; chips->chip.free = gpiochip_generic_free;
#endif #endif
......
...@@ -609,7 +609,6 @@ static int sprd_eic_probe(struct platform_device *pdev) ...@@ -609,7 +609,6 @@ static int sprd_eic_probe(struct platform_device *pdev)
sprd_eic->chip.ngpio = pdata->num_eics; sprd_eic->chip.ngpio = pdata->num_eics;
sprd_eic->chip.base = -1; sprd_eic->chip.base = -1;
sprd_eic->chip.parent = &pdev->dev; sprd_eic->chip.parent = &pdev->dev;
sprd_eic->chip.of_node = pdev->dev.of_node;
sprd_eic->chip.direction_input = sprd_eic_direction_input; sprd_eic->chip.direction_input = sprd_eic_direction_input;
switch (sprd_eic->type) { switch (sprd_eic->type) {
case SPRD_EIC_DEBOUNCE: case SPRD_EIC_DEBOUNCE:
......
...@@ -306,7 +306,6 @@ static int em_gio_probe(struct platform_device *pdev) ...@@ -306,7 +306,6 @@ static int em_gio_probe(struct platform_device *pdev)
} }
gpio_chip = &p->gpio_chip; gpio_chip = &p->gpio_chip;
gpio_chip->of_node = dev->of_node;
gpio_chip->direction_input = em_gio_direction_input; gpio_chip->direction_input = em_gio_direction_input;
gpio_chip->get = em_gio_get; gpio_chip->get = em_gio_get;
gpio_chip->direction_output = em_gio_direction_output; gpio_chip->direction_output = em_gio_direction_output;
......
...@@ -82,7 +82,6 @@ static int __init gef_gpio_probe(struct platform_device *pdev) ...@@ -82,7 +82,6 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
gc->base = -1; gc->base = -1;
gc->ngpio = (u16)(uintptr_t)of_device_get_match_data(&pdev->dev); gc->ngpio = (u16)(uintptr_t)of_device_get_match_data(&pdev->dev);
gc->of_gpio_n_cells = 2; gc->of_gpio_n_cells = 2;
gc->of_node = pdev->dev.of_node;
/* This function adds a memory mapped GPIO chip */ /* This function adds a memory mapped GPIO chip */
ret = devm_gpiochip_add_data(&pdev->dev, gc, NULL); ret = devm_gpiochip_add_data(&pdev->dev, gc, NULL);
......
...@@ -358,7 +358,6 @@ static int grgpio_probe(struct platform_device *ofdev) ...@@ -358,7 +358,6 @@ static int grgpio_probe(struct platform_device *ofdev)
priv->imask = gc->read_reg(regs + GRGPIO_IMASK); priv->imask = gc->read_reg(regs + GRGPIO_IMASK);
priv->dev = &ofdev->dev; priv->dev = &ofdev->dev;
gc->of_node = np;
gc->owner = THIS_MODULE; gc->owner = THIS_MODULE;
gc->to_irq = grgpio_to_irq; gc->to_irq = grgpio_to_irq;
gc->label = devm_kasprintf(&ofdev->dev, GFP_KERNEL, "%pOF", np); gc->label = devm_kasprintf(&ofdev->dev, GFP_KERNEL, "%pOF", np);
......
...@@ -82,7 +82,6 @@ static int gw_pld_probe(struct i2c_client *client, ...@@ -82,7 +82,6 @@ static int gw_pld_probe(struct i2c_client *client,
gw->chip.base = -1; gw->chip.base = -1;
gw->chip.can_sleep = true; gw->chip.can_sleep = true;
gw->chip.parent = dev; gw->chip.parent = dev;
gw->chip.of_node = np;
gw->chip.owner = THIS_MODULE; gw->chip.owner = THIS_MODULE;
gw->chip.label = dev_name(dev); gw->chip.label = dev_name(dev);
gw->chip.ngpio = 8; gw->chip.ngpio = 8;
......
...@@ -217,7 +217,6 @@ mediatek_gpio_bank_probe(struct device *dev, ...@@ -217,7 +217,6 @@ mediatek_gpio_bank_probe(struct device *dev,
memset(rg, 0, sizeof(*rg)); memset(rg, 0, sizeof(*rg));
spin_lock_init(&rg->lock); spin_lock_init(&rg->lock);
rg->chip.of_node = node;
rg->bank = bank; rg->bank = bank;
dat = mtk->base + GPIO_REG_DATA + (rg->bank * GPIO_BANK_STRIDE); dat = mtk->base + GPIO_REG_DATA + (rg->bank * GPIO_BANK_STRIDE);
......
...@@ -1183,7 +1183,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) ...@@ -1183,7 +1183,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
mvchip->chip.base = id * MVEBU_MAX_GPIO_PER_BANK; mvchip->chip.base = id * MVEBU_MAX_GPIO_PER_BANK;
mvchip->chip.ngpio = ngpios; mvchip->chip.ngpio = ngpios;
mvchip->chip.can_sleep = false; mvchip->chip.can_sleep = false;
mvchip->chip.of_node = np;
mvchip->chip.dbg_show = mvebu_gpio_dbg_show; mvchip->chip.dbg_show = mvebu_gpio_dbg_show;
if (soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) if (soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K)
......
...@@ -1419,9 +1419,6 @@ static int omap_gpio_probe(struct platform_device *pdev) ...@@ -1419,9 +1419,6 @@ static int omap_gpio_probe(struct platform_device *pdev)
bank->is_mpuio = pdata->is_mpuio; bank->is_mpuio = pdata->is_mpuio;
bank->non_wakeup_gpios = pdata->non_wakeup_gpios; bank->non_wakeup_gpios = pdata->non_wakeup_gpios;
bank->regs = pdata->regs; bank->regs = pdata->regs;
#ifdef CONFIG_OF_GPIO
bank->chip.of_node = of_node_get(node);
#endif
if (node) { if (node) {
if (!of_property_read_bool(node, "ti,gpio-always-on")) if (!of_property_read_bool(node, "ti,gpio-always-on"))
......
...@@ -170,9 +170,7 @@ static int palmas_gpio_probe(struct platform_device *pdev) ...@@ -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.set = palmas_gpio_set;
palmas_gpio->gpio_chip.get = palmas_gpio_get; palmas_gpio->gpio_chip.get = palmas_gpio_get;
palmas_gpio->gpio_chip.parent = &pdev->dev; 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); palmas_pdata = dev_get_platdata(palmas->dev);
if (palmas_pdata && palmas_pdata->gpio_base) if (palmas_pdata && palmas_pdata->gpio_base)
palmas_gpio->gpio_chip.base = palmas_pdata->gpio_base; palmas_gpio->gpio_chip.base = palmas_pdata->gpio_base;
......
...@@ -331,7 +331,6 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) ...@@ -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.ngpio = SPRD_PMIC_EIC_NR;
pmic_eic->chip.base = -1; pmic_eic->chip.base = -1;
pmic_eic->chip.parent = &pdev->dev; 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.direction_input = sprd_pmic_eic_direction_input;
pmic_eic->chip.request = sprd_pmic_eic_request; pmic_eic->chip.request = sprd_pmic_eic_request;
pmic_eic->chip.free = sprd_pmic_eic_free; pmic_eic->chip.free = sprd_pmic_eic_free;
......
...@@ -221,7 +221,6 @@ static int rpi_exp_gpio_probe(struct platform_device *pdev) ...@@ -221,7 +221,6 @@ static int rpi_exp_gpio_probe(struct platform_device *pdev)
rpi_gpio->gc.parent = dev; rpi_gpio->gc.parent = dev;
rpi_gpio->gc.label = MODULE_NAME; rpi_gpio->gc.label = MODULE_NAME;
rpi_gpio->gc.owner = THIS_MODULE; rpi_gpio->gc.owner = THIS_MODULE;
rpi_gpio->gc.of_node = np;
rpi_gpio->gc.base = -1; rpi_gpio->gc.base = -1;
rpi_gpio->gc.ngpio = NUM_GPIO; rpi_gpio->gc.ngpio = NUM_GPIO;
......
...@@ -240,8 +240,6 @@ static int rda_gpio_probe(struct platform_device *pdev) ...@@ -240,8 +240,6 @@ static int rda_gpio_probe(struct platform_device *pdev)
rda_gpio->chip.label = dev_name(dev); rda_gpio->chip.label = dev_name(dev);
rda_gpio->chip.ngpio = ngpios; rda_gpio->chip.ngpio = ngpios;
rda_gpio->chip.base = -1; rda_gpio->chip.base = -1;
rda_gpio->chip.parent = dev;
rda_gpio->chip.of_node = np;
if (rda_gpio->irq >= 0) { if (rda_gpio->irq >= 0) {
rda_gpio->irq_chip.name = "rda-gpio", rda_gpio->irq_chip.name = "rda-gpio",
......
...@@ -584,9 +584,6 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank) ...@@ -584,9 +584,6 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank)
gc->ngpio = bank->nr_pins; gc->ngpio = bank->nr_pins;
gc->label = bank->name; gc->label = bank->name;
gc->parent = bank->dev; gc->parent = bank->dev;
#ifdef CONFIG_OF_GPIO
gc->of_node = of_node_get(bank->of_node);
#endif
ret = gpiochip_add_data(gc, bank); ret = gpiochip_add_data(gc, bank);
if (ret) { if (ret) {
......
...@@ -192,7 +192,6 @@ static int sama5d2_piobu_probe(struct platform_device *pdev) ...@@ -192,7 +192,6 @@ static int sama5d2_piobu_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, piobu); platform_set_drvdata(pdev, piobu);
piobu->chip.label = pdev->name; piobu->chip.label = pdev->name;
piobu->chip.parent = &pdev->dev; piobu->chip.parent = &pdev->dev;
piobu->chip.of_node = pdev->dev.of_node;
piobu->chip.owner = THIS_MODULE, piobu->chip.owner = THIS_MODULE,
piobu->chip.get_direction = sama5d2_piobu_get_direction, piobu->chip.get_direction = sama5d2_piobu_get_direction,
piobu->chip.direction_input = sama5d2_piobu_direction_input, piobu->chip.direction_input = sama5d2_piobu_direction_input,
......
...@@ -237,7 +237,6 @@ static int sprd_gpio_probe(struct platform_device *pdev) ...@@ -237,7 +237,6 @@ static int sprd_gpio_probe(struct platform_device *pdev)
sprd_gpio->chip.ngpio = SPRD_GPIO_NR; sprd_gpio->chip.ngpio = SPRD_GPIO_NR;
sprd_gpio->chip.base = -1; sprd_gpio->chip.base = -1;
sprd_gpio->chip.parent = &pdev->dev; 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.request = sprd_gpio_request;
sprd_gpio->chip.free = sprd_gpio_free; sprd_gpio->chip.free = sprd_gpio_free;
sprd_gpio->chip.get = sprd_gpio_get; sprd_gpio->chip.get = sprd_gpio_get;
......
...@@ -477,7 +477,6 @@ static int stmpe_gpio_probe(struct platform_device *pdev) ...@@ -477,7 +477,6 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
stmpe_gpio->chip = template_chip; stmpe_gpio->chip = template_chip;
stmpe_gpio->chip.ngpio = stmpe->num_gpios; stmpe_gpio->chip.ngpio = stmpe->num_gpios;
stmpe_gpio->chip.parent = &pdev->dev; stmpe_gpio->chip.parent = &pdev->dev;
stmpe_gpio->chip.of_node = np;
stmpe_gpio->chip.base = -1; stmpe_gpio->chip.base = -1;
if (IS_ENABLED(CONFIG_DEBUG_FS)) if (IS_ENABLED(CONFIG_DEBUG_FS))
......
...@@ -319,7 +319,6 @@ static int tc3589x_gpio_probe(struct platform_device *pdev) ...@@ -319,7 +319,6 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
tc3589x_gpio->chip.ngpio = tc3589x->num_gpio; tc3589x_gpio->chip.ngpio = tc3589x->num_gpio;
tc3589x_gpio->chip.parent = &pdev->dev; tc3589x_gpio->chip.parent = &pdev->dev;
tc3589x_gpio->chip.base = -1; tc3589x_gpio->chip.base = -1;
tc3589x_gpio->chip.of_node = np;
girq = &tc3589x_gpio->chip.irq; girq = &tc3589x_gpio->chip.irq;
girq->chip = &tc3589x_gpio_irq_chip; girq->chip = &tc3589x_gpio_irq_chip;
......
...@@ -749,7 +749,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev) ...@@ -749,7 +749,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
gpio->gpio.names = (const char * const *)names; gpio->gpio.names = (const char * const *)names;
#if defined(CONFIG_OF_GPIO) #if defined(CONFIG_OF_GPIO)
gpio->gpio.of_node = pdev->dev.of_node;
gpio->gpio.of_gpio_n_cells = 2; gpio->gpio.of_gpio_n_cells = 2;
gpio->gpio.of_xlate = tegra186_gpio_of_xlate; gpio->gpio.of_xlate = tegra186_gpio_of_xlate;
#endif /* CONFIG_OF_GPIO */ #endif /* CONFIG_OF_GPIO */
......
...@@ -196,9 +196,6 @@ static int tps65218_gpio_probe(struct platform_device *pdev) ...@@ -196,9 +196,6 @@ static int tps65218_gpio_probe(struct platform_device *pdev)
tps65218_gpio->tps65218 = tps65218; tps65218_gpio->tps65218 = tps65218;
tps65218_gpio->gpio_chip = template_chip; tps65218_gpio->gpio_chip = template_chip;
tps65218_gpio->gpio_chip.parent = &pdev->dev; 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, return devm_gpiochip_add_data(&pdev->dev, &tps65218_gpio->gpio_chip,
tps65218_gpio); tps65218_gpio);
......
...@@ -298,7 +298,6 @@ static int vf610_gpio_probe(struct platform_device *pdev) ...@@ -298,7 +298,6 @@ static int vf610_gpio_probe(struct platform_device *pdev)
} }
gc = &port->gc; gc = &port->gc;
gc->of_node = np;
gc->parent = dev; gc->parent = dev;
gc->label = "vf610-gpio"; gc->label = "vf610-gpio";
gc->ngpio = VF610_GPIO_PER_PORT; gc->ngpio = VF610_GPIO_PER_PORT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment