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

pinctrl: tegra-xusb: Use devm_pinctrl_register() for pinctrl registration 



Use devm_pinctrl_register() for pin control registration and clean
the error path.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Jon Hunter <jonathanh@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f1daa8a1

drivers/pinctrl/tegra/pinctrl-tegra-xusb.c

+5 −8
Original line number Diff line number Diff line
@@ -914,7 +914,8 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) 
	padctl->desc.confops = &tegra_xusb_padctl_pinconf_ops;

	padctl->desc.owner = THIS_MODULE;



	padctl->pinctrl = pinctrl_register(&padctl->desc, &pdev->dev, padctl);

	padctl->pinctrl = devm_pinctrl_register(&pdev->dev, &padctl->desc,

						padctl);

	if (IS_ERR(padctl->pinctrl)) {

		dev_err(&pdev->dev, "failed to register pincontrol\n");

		err = PTR_ERR(padctl->pinctrl);
@@ -924,7 +925,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) 
	phy = devm_phy_create(&pdev->dev, NULL, &pcie_phy_ops);

	if (IS_ERR(phy)) {

		err = PTR_ERR(phy);

		goto unregister;

		goto reset;

	}



	padctl->phys[TEGRA_XUSB_PADCTL_PCIE] = phy;
@@ -933,7 +934,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) 
	phy = devm_phy_create(&pdev->dev, NULL, &sata_phy_ops);

	if (IS_ERR(phy)) {

		err = PTR_ERR(phy);

		goto unregister;

		goto reset;

	}



	padctl->phys[TEGRA_XUSB_PADCTL_SATA] = phy;
@@ -944,13 +945,11 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) 
	if (IS_ERR(padctl->provider)) {

		err = PTR_ERR(padctl->provider);

		dev_err(&pdev->dev, "failed to register PHYs: %d\n", err);

		goto unregister;

		goto reset;

	}



	return 0;



unregister:

	pinctrl_unregister(padctl->pinctrl);

reset:

	reset_control_assert(padctl->rst);

	return err;
@@ -961,8 +960,6 @@ static int tegra_xusb_padctl_remove(struct platform_device *pdev) 
	struct tegra_xusb_padctl *padctl = platform_get_drvdata(pdev);

	int err;



	pinctrl_unregister(padctl->pinctrl);



	err = reset_control_assert(padctl->rst);

	if (err < 0)

		dev_err(&pdev->dev, "failed to assert reset: %d\n", err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE