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

Commit 1ac471ed authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij
Browse files

pinctrl: uniphier: Use devm_pinctrl_register() for pinctrl registration 



Use devm_pinctrl_register() for pin control registration and remove
need of .remove callback.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e46e3ef3

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

+1 −11
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ int uniphier_pinctrl_probe(struct platform_device *pdev, 
	desc->pmxops = &uniphier_pmxops;

	desc->confops = &uniphier_confops;



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

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

	if (IS_ERR(priv->pctldev)) {

		dev_err(dev, "failed to register UniPhier pinctrl driver\n");

		return PTR_ERR(priv->pctldev);
@@ -676,13 +676,3 @@ int uniphier_pinctrl_probe(struct platform_device *pdev, 
	return 0;

}

EXPORT_SYMBOL_GPL(uniphier_pinctrl_probe);
 


int uniphier_pinctrl_remove(struct platform_device *pdev)

{

	struct uniphier_pinctrl_priv *priv = platform_get_drvdata(pdev);



	pinctrl_unregister(priv->pctldev);



	return 0;

}

EXPORT_SYMBOL_GPL(uniphier_pinctrl_remove);

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

+0 −1
Original line number Diff line number Diff line
@@ -878,7 +878,6 @@ MODULE_DEVICE_TABLE(of, ph1_ld4_pinctrl_match); 


static struct platform_driver ph1_ld4_pinctrl_driver = {

	.probe = ph1_ld4_pinctrl_probe,

	.remove = uniphier_pinctrl_remove,

	.driver = {

		.name = DRIVER_NAME,

		.of_match_table = ph1_ld4_pinctrl_match,

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

+0 −1
Original line number Diff line number Diff line
@@ -1266,7 +1266,6 @@ MODULE_DEVICE_TABLE(of, ph1_ld6b_pinctrl_match); 


static struct platform_driver ph1_ld6b_pinctrl_driver = {

	.probe = ph1_ld6b_pinctrl_probe,

	.remove = uniphier_pinctrl_remove,

	.driver = {

		.name = DRIVER_NAME,

		.of_match_table = ph1_ld6b_pinctrl_match,

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

+0 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,6 @@ MODULE_DEVICE_TABLE(of, ph1_pro4_pinctrl_match); 


static struct platform_driver ph1_pro4_pinctrl_driver = {

	.probe = ph1_pro4_pinctrl_probe,

	.remove = uniphier_pinctrl_remove,

	.driver = {

		.name = DRIVER_NAME,

		.of_match_table = ph1_pro4_pinctrl_match,

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

+0 −1
Original line number Diff line number Diff line
@@ -1343,7 +1343,6 @@ MODULE_DEVICE_TABLE(of, ph1_pro5_pinctrl_match); 


static struct platform_driver ph1_pro5_pinctrl_driver = {

	.probe = ph1_pro5_pinctrl_probe,

	.remove = uniphier_pinctrl_remove,

	.driver = {

		.name = DRIVER_NAME,

		.of_match_table = ph1_pro5_pinctrl_match,