Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d36b245 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Walleij
Browse files

pinctrl: uniphier: set pinctrl_desc owner in common probe function 



The owner of the struct pinctrl_desc matches that of platform_driver.
Set it in the common probe function.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4725774f

drivers/pinctrl/uniphier/pinctrl-uniphier-core.c

+1 −0
Original line number Diff line number Diff line
@@ -670,6 +670,7 @@ int uniphier_pinctrl_probe(struct platform_device *pdev, 
	desc->pctlops = &uniphier_pctlops;

	desc->pmxops = &uniphier_pmxops;

	desc->confops = &uniphier_confops;

	desc->owner = dev->driver->owner;



	priv->pctldev = devm_pinctrl_register(dev, desc, priv);

	if (IS_ERR(priv->pctldev)) {

drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c

+0 −1
Original line number Diff line number Diff line
@@ -861,7 +861,6 @@ static struct pinctrl_desc uniphier_ld4_pinctrl_desc = { 
	.name = DRIVER_NAME,

	.pins = uniphier_ld4_pins,

	.npins = ARRAY_SIZE(uniphier_ld4_pins),

	.owner = THIS_MODULE,

};



static int uniphier_ld4_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c

+0 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,6 @@ static struct pinctrl_desc uniphier_ld6b_pinctrl_desc = { 
	.name = DRIVER_NAME,

	.pins = uniphier_ld6b_pins,

	.npins = ARRAY_SIZE(uniphier_ld6b_pins),

	.owner = THIS_MODULE,

};



static int uniphier_ld6b_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c

+0 −1
Original line number Diff line number Diff line
@@ -1535,7 +1535,6 @@ static struct pinctrl_desc uniphier_pro4_pinctrl_desc = { 
	.name = DRIVER_NAME,

	.pins = uniphier_pro4_pins,

	.npins = ARRAY_SIZE(uniphier_pro4_pins),

	.owner = THIS_MODULE,

};



static int uniphier_pro4_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c

+0 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,6 @@ static struct pinctrl_desc uniphier_pro5_pinctrl_desc = { 
	.name = DRIVER_NAME,

	.pins = uniphier_pro5_pins,

	.npins = ARRAY_SIZE(uniphier_pro5_pins),

	.owner = THIS_MODULE,

};



static int uniphier_pro5_pinctrl_probe(struct platform_device *pdev)