| Message ID | 20190722091015.20884-1-ckeepax@opensource.cirrus.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] pinctrl: madera: Use local copy of pdata | expand |
On Mon, Jul 22, 2019 at 11:10 AM Charles Keepax <ckeepax@opensource.cirrus.com> wrote: > A local copy of the pdata exists and it should be used rather than > pulling a fresh copy. > > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Patch applied. Yours, Linus Walleij
diff --git a/drivers/pinctrl/cirrus/pinctrl-madera-core.c b/drivers/pinctrl/cirrus/pinctrl-madera-core.c index c6b9f65f23621..0c7fa1febc802 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) {
A local copy of the pdata exists and it should be used rather than pulling a fresh copy. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> --- drivers/pinctrl/cirrus/pinctrl-madera-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)