From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <kishon@ti.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 09/10] phy: rockhip-usb: use devm_add_action_or_reset()
Date: Tue, 5 Jul 2016 10:53:56 +0530 [thread overview]
Message-ID: <1467696237-27831-10-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1467696237-27831-1-git-send-email-kishon@ti.com>
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
If devm_add_action() fails we are explicitly calling the cleanup to free
the resources allocated. Lets use the helper devm_add_action_or_reset()
and return directly in case of error, as we know that the cleanup function
has been already called by the helper if there was any error.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/phy/phy-rockchip-usb.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c
index e66b5bf..2a7381f 100644
--- a/drivers/phy/phy-rockchip-usb.c
+++ b/drivers/phy/phy-rockchip-usb.c
@@ -236,9 +236,10 @@ static int rockchip_usb_phy_init(struct rockchip_usb_phy_base *base,
goto err_clk_prov;
}
- err = devm_add_action(base->dev, rockchip_usb_phy_action, rk_phy);
+ err = devm_add_action_or_reset(base->dev, rockchip_usb_phy_action,
+ rk_phy);
if (err)
- goto err_devm_action;
+ return err;
rk_phy->phy = devm_phy_create(base->dev, child, &ops);
if (IS_ERR(rk_phy->phy)) {
@@ -256,9 +257,6 @@ static int rockchip_usb_phy_init(struct rockchip_usb_phy_base *base,
else
return rockchip_usb_phy_power(rk_phy, 1);
-err_devm_action:
- if (!rk_phy->uart_enabled)
- of_clk_del_provider(child);
err_clk_prov:
if (!rk_phy->uart_enabled)
clk_unregister(rk_phy->clk480m);
--
1.7.9.5
next prev parent reply other threads:[~2016-07-05 5:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 5:23 [GIT PULL] phy: for 4.8 merge window Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 01/10] phy: xgene: rename "enum phy_mode" to "enum xgene_phy_mode" Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 02/10] phy: Add set_mode callback Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 03/10] dt-bindings: Add bindings for phy-da8xx-usb Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 04/10] phy: da8xx-usb: new driver for DA8xx SoC USB PHY Kishon Vijay Abraham I
2016-07-15 21:14 ` Arnd Bergmann
2016-07-18 5:51 ` Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 05/10] phy: rockchip-usb: should be a child device of the GRF Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 06/10] phy: phy-qcom-ufs-qmp-20nm: Remove site specific OOM error message Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 07/10] phy: phy-qcom-ufs-qmp-14nm: " Kishon Vijay Abraham I
2016-07-05 5:23 ` [PATCH 08/10] phy-sun4i-usb: Add workaround for missing Vbus det interrupts on A31 Kishon Vijay Abraham I
2016-07-05 5:23 ` Kishon Vijay Abraham I [this message]
2016-07-05 5:23 ` [PATCH 10/10] phy: rcar-gen3-usb2: fix mutex_lock calling in interrupt Kishon Vijay Abraham I
2016-07-14 3:04 ` [GIT PULL] phy: for 4.8 merge window Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467696237-27831-10-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox