From: jszhang@marvell.com (Jisheng Zhang)
To: linux-arm-kernel@lists.infradead.org
Subject: [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path
Date: Tue, 26 Apr 2016 20:57:38 +0800 [thread overview]
Message-ID: <1461675460-2295-6-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1461675460-2295-1-git-send-email-jszhang@marvell.com>
Commit 63589e92c2d9 ("clk: Ignore error and NULL pointers passed to
clk_{unprepare, disable}()") allows NULL or error pointer to be passed
unconditionally.
This patch is to simplify probe error and remove code paths.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/usb/host/xhci-plat.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 0e69712..83669d0 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -266,8 +266,7 @@ put_usb3_hcd:
usb_put_hcd(xhci->shared_hcd);
disable_clk:
- if (!IS_ERR(clk))
- clk_disable_unprepare(clk);
+ clk_disable_unprepare(clk);
put_hcd:
usb_put_hcd(hcd);
@@ -287,8 +286,7 @@ static int xhci_plat_remove(struct platform_device *dev)
usb_remove_hcd(hcd);
usb_put_hcd(xhci->shared_hcd);
- if (!IS_ERR(clk))
- clk_disable_unprepare(clk);
+ clk_disable_unprepare(clk);
usb_put_hcd(hcd);
return 0;
--
2.8.1
next prev parent reply other threads:[~2016-04-26 12:57 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 12:57 [RESEND PATCH v2 0/7] usb: xhci-plat: support generic PHY and vbus regulator Jisheng Zhang
2016-04-26 12:57 ` [RESEND PATCH v2 1/7] usb: xhci: plat: Fix suspend/resume when the optional clk exists Jisheng Zhang
2016-04-27 5:25 ` Felipe Balbi
2016-04-27 5:46 ` Jisheng Zhang
2016-04-26 12:57 ` [RESEND PATCH v2 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Jisheng Zhang
2016-04-27 5:29 ` Felipe Balbi
2016-04-27 5:59 ` Jisheng Zhang
2016-04-27 6:19 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 3/7] usb: xhci: plat: Fix suspend/resume when the optional usb_phy exists Jisheng Zhang
2016-04-27 5:30 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 4/7] usb: xhci: plat: sort the headers in alphabetic order Jisheng Zhang
2016-04-26 12:57 ` Jisheng Zhang [this message]
2016-04-27 5:33 ` [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Felipe Balbi
2016-04-27 6:33 ` Jisheng Zhang
2016-04-27 7:19 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 6/7] usb: xhci: plat: add generic PHY support Jisheng Zhang
2016-04-27 5:35 ` Felipe Balbi
2016-04-27 6:46 ` Jisheng Zhang
2016-04-27 7:21 ` Felipe Balbi
2016-04-27 7:57 ` Heikki Krogerus
2016-04-27 9:34 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 7/7] usb: xhci: plat: add vbus regulator control Jisheng Zhang
2016-04-27 5:37 ` Felipe Balbi
2016-04-27 9:57 ` Mark Brown
2016-04-27 10:25 ` Jisheng Zhang
2016-04-27 13:24 ` Mark Brown
2016-04-27 10:25 ` Felipe Balbi
2016-04-27 10:35 ` Mark Brown
2016-04-27 10:38 ` Felipe Balbi
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=1461675460-2295-6-git-send-email-jszhang@marvell.com \
--to=jszhang@marvell.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).