hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Laxman 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: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Laxman Dewangan 2016-02-24 14:44:07 +05:30 committed by Linus Walleij
parent f1daa8a1a9
commit e46e3ef3d7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
View File

@ -914,7 +914,8 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
padctl->desc.confops = &tegra_xusb_padctl_pinconf_ops; padctl->desc.confops = &tegra_xusb_padctl_pinconf_ops;
padctl->desc.owner = THIS_MODULE; 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)) { if (IS_ERR(padctl->pinctrl)) {
dev_err(&pdev->dev, "failed to register pincontrol\n"); dev_err(&pdev->dev, "failed to register pincontrol\n");
err = PTR_ERR(padctl->pinctrl); 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); phy = devm_phy_create(&pdev->dev, NULL, &pcie_phy_ops);
if (IS_ERR(phy)) { if (IS_ERR(phy)) {
err = PTR_ERR(phy); err = PTR_ERR(phy);
goto unregister; goto reset;
} }
padctl->phys[TEGRA_XUSB_PADCTL_PCIE] = phy; 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); phy = devm_phy_create(&pdev->dev, NULL, &sata_phy_ops);
if (IS_ERR(phy)) { if (IS_ERR(phy)) {
err = PTR_ERR(phy); err = PTR_ERR(phy);
goto unregister; goto reset;
} }
padctl->phys[TEGRA_XUSB_PADCTL_SATA] = phy; 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)) { if (IS_ERR(padctl->provider)) {
err = PTR_ERR(padctl->provider); err = PTR_ERR(padctl->provider);
dev_err(&pdev->dev, "failed to register PHYs: %d\n", err); dev_err(&pdev->dev, "failed to register PHYs: %d\n", err);
goto unregister; goto reset;
} }
return 0; return 0;
unregister:
pinctrl_unregister(padctl->pinctrl);
reset: reset:
reset_control_assert(padctl->rst); reset_control_assert(padctl->rst);
return err; 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); struct tegra_xusb_padctl *padctl = platform_get_drvdata(pdev);
int err; int err;
pinctrl_unregister(padctl->pinctrl);
err = reset_control_assert(padctl->rst); err = reset_control_assert(padctl->rst);
if (err < 0) if (err < 0)
dev_err(&pdev->dev, "failed to assert reset: %d\n", err); dev_err(&pdev->dev, "failed to assert reset: %d\n", err);