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

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

pinctrl: imx: 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: Shawn Guo <shawnguo@kernel.org>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Adrian Alonso <aalonso@freescale.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7e73f819

drivers/pinctrl/freescale/pinctrl-imx.c

+1 −10
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ int imx_pinctrl_probe(struct platform_device *pdev, 
	ipctl->info = info;

	ipctl->dev = info->dev;

	platform_set_drvdata(pdev, ipctl);

	ipctl->pctl = pinctrl_register(&imx_pinctrl_desc, &pdev->dev, ipctl);

	ipctl->pctl = devm_pinctrl_register(&pdev->dev, &imx_pinctrl_desc, ipctl);

	if (IS_ERR(ipctl->pctl)) {

		dev_err(&pdev->dev, "could not register IMX pinctrl driver\n");

		return PTR_ERR(ipctl->pctl);
@@ -800,12 +800,3 @@ int imx_pinctrl_probe(struct platform_device *pdev, 


	return 0;

}
 


int imx_pinctrl_remove(struct platform_device *pdev)

{

	struct imx_pinctrl *ipctl = platform_get_drvdata(pdev);



	pinctrl_unregister(ipctl->pctl);



	return 0;

}

drivers/pinctrl/freescale/pinctrl-imx.h

+0 −1
Original line number Diff line number Diff line
@@ -99,5 +99,4 @@ struct imx_pinctrl_soc_info { 


int imx_pinctrl_probe(struct platform_device *pdev,

			struct imx_pinctrl_soc_info *info);

int imx_pinctrl_remove(struct platform_device *pdev);

#endif /* __DRIVERS_PINCTRL_IMX_H */

drivers/pinctrl/freescale/pinctrl-imx25.c

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ static struct platform_driver imx25_pinctrl_driver = { 
		.of_match_table = of_match_ptr(imx25_pinctrl_of_match),

	},

	.probe = imx25_pinctrl_probe,

	.remove = imx_pinctrl_remove,

};



static int __init imx25_pinctrl_init(void)

drivers/pinctrl/freescale/pinctrl-imx35.c

+0 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,6 @@ static struct platform_driver imx35_pinctrl_driver = { 
		.of_match_table = imx35_pinctrl_of_match,

	},

	.probe = imx35_pinctrl_probe,

	.remove = imx_pinctrl_remove,

};



static int __init imx35_pinctrl_init(void)

drivers/pinctrl/freescale/pinctrl-imx50.c

+0 −1
Original line number Diff line number Diff line
@@ -408,7 +408,6 @@ static struct platform_driver imx50_pinctrl_driver = { 
		.of_match_table = of_match_ptr(imx50_pinctrl_of_match),

	},

	.probe = imx50_pinctrl_probe,

	.remove = imx_pinctrl_remove,

};



static int __init imx50_pinctrl_init(void)