From: Charles Keepax Date: Mon, 22 Jul 2019 09:10:13 +0000 (+0100) Subject: pinctrl: madera: Use local copy of pdata X-Git-Tag: v5.4-rc1~107^2~68 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f134b8517736bddc52955fef08e70bde7d408c0b;p=linux.git pinctrl: madera: Use local copy of pdata A local copy of the pdata exists and it should be used rather than pulling a fresh copy. Signed-off-by: Charles Keepax Link: https://lore.kernel.org/r/20190722091015.20884-1-ckeepax@opensource.cirrus.com Signed-off-by: Linus Walleij --- diff --git a/drivers/pinctrl/cirrus/pinctrl-madera-core.c b/drivers/pinctrl/cirrus/pinctrl-madera-core.c index c6b9f65f2362..0c7fa1febc80 100644 --- a/drivers/pinctrl/cirrus/pinctrl-madera-core.c +++ b/drivers/pinctrl/cirrus/pinctrl-madera-core.c @@ -986,7 +986,7 @@ static struct pinctrl_desc madera_pin_desc = { static int madera_pin_probe(struct platform_device *pdev) { struct madera *madera = dev_get_drvdata(pdev->dev.parent); - const struct madera_pdata *pdata = dev_get_platdata(madera->dev); + const struct madera_pdata *pdata = &madera->pdata; struct madera_pin_private *priv; int ret; @@ -1037,7 +1037,7 @@ static int madera_pin_probe(struct platform_device *pdev) } /* if the configuration is provided through pdata, apply it */ - if (pdata && pdata->gpio_configs) { + if (pdata->gpio_configs) { ret = pinctrl_register_mappings(pdata->gpio_configs, pdata->n_gpio_configs); if (ret) {