Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1341988

[PATCH 30/50] pinctrl: tegra-xusb: Use devm_pinctrl_register() for pinctrl registration

From Laxman Dewangan <ldewangan@nvidia.com>
Newsgroups linux.kernel
Subject [PATCH 30/50] pinctrl: tegra-xusb: Use devm_pinctrl_register() for pinctrl registration
Date 2016-02-24 14:40 +0100
Message-ID <r5HPC-5eb-43@gated-at.bofh.it> (permalink)
References <r5HFV-59T-43@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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>
---
 drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
index 2f06029..19f16f4 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
@@ -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);
-- 
2.1.4

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/50] pinctrl: Add and use devm_ apis for pinctrl_{register, unregister} Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:30 +0100
  [PATCH 15/50] pinctrl: mvebu: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 15/50] pinctrl: mvebu: Use devm_pinctrl_register() for  pinctrl registration Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2016-02-24 15:10 +0100
    Re: [PATCH 15/50] pinctrl: mvebu: Use devm_pinctrl_register() for  pinctrl registration kbuild test robot <lkp@intel.com> - 2016-02-24 19:40 +0100
  [PATCH 10/50] pinctrl: imxl: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 37/50] pinctrl: at91: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 49/50] pinctrl: u300: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 33/50] pinctrl: adi2: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 24/50] pinctrl: samsung: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 34/50] pinctrl: amd: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 31/50] pinctrl: uniphier: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 31/50] pinctrl: uniphier: Use devm_pinctrl_register() for  pinctrl registration Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-02-26 11:10 +0100
  [PATCH 03/50] pinctrl: bcm281xx: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 03/50] pinctrl: bcm281xx: Use devm_pinctrl_register() for  pinctrl registration Ray Jui <ray.jui@broadcom.com> - 2016-02-24 19:30 +0100
  [PATCH 45/50] pinctrl: st: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 45/50] pinctrl: st: Use devm_pinctrl_register() for  pinctrl registration Maxime Coquelin <maxime.coquelin@st.com> - 2016-02-24 17:20 +0100
  [PATCH 47/50] pinctrl: tz1090-pdc: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 01/50] pinctrl: Add devm_ apis for pinctrl_{register, unregister} Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 01/50] pinctrl: Add devm_ apis for pinctrl_{register,  unregister} Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-02-24 19:30 +0100
    Re: [PATCH 01/50] pinctrl: Add devm_ apis for pinctrl_{register,  unregister} Philipp Zabel <p.zabel@pengutronix.de> - 2016-02-25 15:50 +0100
  [PATCH 30/50] pinctrl: tegra-xusb: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 30/50] pinctrl: tegra-xusb: Use devm_pinctrl_register()  for pinctrl registration Stephen Warren <swarren@wwwdotorg.org> - 2016-02-24 17:50 +0100
  [PATCH 29/50] pinctrl: tegra: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 29/50] pinctrl: tegra: Use devm_pinctrl_register() for  pinctrl registration Stephen Warren <swarren@wwwdotorg.org> - 2016-02-24 17:50 +0100
  [PATCH 32/50] pinctrl: vt8500: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 43/50] pinctrl: pistachio: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 35/50] pinctrl: as3722: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 05/50] pinctrl: cygnus-mux: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 05/50] pinctrl: cygnus-mux: Use devm_pinctrl_register()  for pinctrl registration Ray Jui <ray.jui@broadcom.com> - 2016-02-24 19:30 +0100
  [PATCH 42/50] pinctrl: pic32: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 42/50] pinctrl: pic32: Use devm_pinctrl_register() for  pinctrl registration Joshua Henderson <joshua.henderson@microchip.com> - 2016-02-25 21:40 +0100
  [PATCH 46/50] pinctrl: tb10x: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 19/50] pinctrl: ssbi-gpi: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 19/50] pinctrl: ssbi-gpi: Use devm_pinctrl_register() for  pinctrl registration Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-02-24 19:10 +0100
  [PATCH 07/50] pinctrl: nsp-gpio: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 44/50] pinctrl: rockchip: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 44/50] pinctrl: rockchip: Use devm_pinctrl_register() for pinctrl registration Heiko Stübner <heiko@sntech.de> - 2016-03-02 22:50 +0100
  [PATCH 17/50] pinctrl: spmi-gpio: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 17/50] pinctrl: spmi-gpio: Use devm_pinctrl_register()  for pinctrl registration Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-02-24 19:10 +0100
  [PATCH 18/50] pinctrl: spmi: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 18/50] pinctrl: spmi: Use devm_pinctrl_register() for  pinctrl registration Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-02-24 19:10 +0100
  [PATCH 12/50] pinctrl: intel: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 12/50] pinctrl: intel: Use devm_pinctrl_register() for  pinctrl registration Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-02-25 12:50 +0100
  [PATCH 36/50] pinctrl: at91-pio4: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 38/50] pinctrl: digicolor: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 38/50] pinctrl: digicolor: Use devm_pinctrl_register()  for pinctrl registration Baruch Siach <baruch@tkos.co.il> - 2016-02-24 14:50 +0100
  [PATCH 50/50] pinctrl: zynq: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 50/50] pinctrl: zynq: Use devm_pinctrl_register() for  pinctrl registration Sören Brinkmann <soren.brinkmann@xilinx.com> - 2016-02-26 04:50 +0100
  [PATCH 48/50] pinctrl: tz1090 Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 41/50] pinctrl: palmas: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 28/50] pinctrl: ssbi-mpp: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 28/50] pinctrl: ssbi-mpp: Use devm_pinctrl_register() for  pinctrl registration Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-02-24 19:10 +0100
  [PATCH 13/50] pinctrl: mtk-common: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 13/50] pinctrl: mtk-common: Use devm_pinctrl_register()  for pinctrl registration Matthias Brugger <matthias.bgg@gmail.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 13/50] pinctrl: mtk-common: Use devm_pinctrl_register()  for pinctrl registration Hongzhou Yang <hongzhou.yang@mediatek.com> - 2016-02-24 21:40 +0100
  [PATCH 40/50] pinctrl: lpc18xx: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 40/50] pinctrl: lpc18xx: Use devm_pinctrl_register() for  pinctrl registration Joachim Eastwood <manabian@gmail.com> - 2016-02-24 16:10 +0100
  [PATCH 21/50] pinctrl: msm: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 14/50] pinctrl: meson: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 14/50] pinctrl: meson: Use devm_pinctrl_register() for  pinctrl registration Carlo Caione <carlo@caione.org> - 2016-02-26 22:00 +0100
  [PATCH 22/50] pinctrl: pxa: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 22/50] pinctrl: pxa: Use devm_pinctrl_register() for pinctrl registration Robert Jarzmik <robert.jarzmik@free.fr> - 2016-02-26 23:30 +0100
  [PATCH 16/50] pinctrl: nomadic: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 09/50] pinctrl: imx: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 09/50] pinctrl: imx: Use devm_pinctrl_register() for  pinctrl registration Philipp Zabel <p.zabel@pengutronix.de> - 2016-02-25 15:50 +0100
    Re: [PATCH 09/50] pinctrl: imx: Use devm_pinctrl_register() for  pinctrl registration Shawn Guo <shawnguo@kernel.org> - 2016-02-29 04:10 +0100
  [PATCH 06/50] pinctrl: iproc-gpio: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
  [PATCH 39/50] pinctrl: lantiq: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:40 +0100
    Re: [PATCH 39/50] pinctrl: lantiq: Use devm_pinctrl_register() for  pinctrl registration John Crispin <blogic@openwrt.org> - 2016-02-25 15:30 +0100
  [PATCH 11/50] pinctrl: cherryview: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
    Re: [PATCH 11/50] pinctrl: cherryview: Use devm_pinctrl_register()  for pinctrl registration Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-02-25 12:50 +0100
  [PATCH 26/50] pinctrl: spear: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
    Re: [PATCH 26/50] pinctrl: spear: Use devm_pinctrl_register() for  pinctrl registration Viresh Kumar <viresh.kumar@linaro.org> - 2016-02-25 03:20 +0100
  [PATCH 23/50] pinctrl: exynos5440: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
  [PATCH 27/50] pinctrl: stm32: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
    Re: [PATCH 27/50] pinctrl: stm32: Use devm_pinctrl_register() for  pinctrl registration Maxime Coquelin <mcoquelin.stm32@gmail.com> - 2016-02-25 15:10 +0100
  [PATCH 08/50] pinctrl: berlin: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
    Re: [PATCH 08/50] pinctrl: berlin: Use devm_pinctrl_register() for  pinctrl registration Antoine Ténart   <antoine.tenart@free-electrons.com> - 2016-02-24 18:40 +0100
  [PATCH 04/50] pinctrl: bcm2835: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
    Re: [PATCH 04/50] pinctrl: bcm2835: Use devm_pinctrl_register() for  pinctrl registration Ray Jui <ray.jui@broadcom.com> - 2016-02-24 19:30 +0100
  [PATCH 25/50] pinctrl: ish-pfc: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
    Re: [PATCH 25/50] pinctrl: ish-pfc: Use devm_pinctrl_register() for  pinctrl registration Geert Uytterhoeven <geert@linux-m68k.org> - 2016-02-24 15:00 +0100
  [PATCH 20/50] pinctrl: ssbi-mpp: Use devm_pinctrl_register() for pinctrl registration Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 14:50 +0100
  [PATCH 02/50] pinctrl: Add resource management devm_pinctrl_{register, unregister} Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 15:00 +0100
  Re: [PATCH 00/50] pinctrl: Add and use devm_ apis for  pinctrl_{register, unregister} Stefan Wahren <stefan.wahren@i2se.com> - 2016-02-24 18:30 +0100
    Re: [PATCH 00/50] pinctrl: Add and use devm_ apis for pinctrl_{register,  unregister} Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-24 18:30 +0100
  Re: [PATCH 00/50] pinctrl: Add and use devm_ apis for  pinctrl_{register, unregister} Linus Walleij <linus.walleij@linaro.org> - 2016-02-25 15:20 +0100
    Re: [PATCH 00/50] pinctrl: Add and use devm_ apis for pinctrl_{register,  unregister} Laxman Dewangan <ldewangan@nvidia.com> - 2016-02-28 16:00 +0100

csiph-web