Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1283848
| From | Jisheng Zhang <jszhang@marvell.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path |
| Date | 2015-12-04 15:20 +0100 |
| Message-ID | <qBZnl-3Km-21@gated-at.bofh.it> (permalink) |
| References | <qBZnk-3Km-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 d990135..62f02e5 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -197,8 +197,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);
@@ -218,8 +217,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.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/7] usb: xhci-plat: support generic PHY and vbus regulator Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 6/7] usb: xhci: plat: add generic PHY support Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 6/7] usb: xhci: plat: add generic PHY support Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
Re: [PATCH 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 4/7] usb: xhci: plat: sort the headers in alphabetic order Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 4/7] usb: xhci: plat: sort the headers in alphabetic order Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
[PATCH 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 3/7] usb: xhci: plat: Fix suspend/resume when the optional usb_phy exists Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
Re: [PATCH 0/7] usb: xhci-plat: support generic PHY and vbus regulator Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 7/7] usb: xhci: plat: add vbus regulator control Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 7/7] usb: xhci: plat: add vbus regulator control Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
[PATCH 1/7] usb: xhci: plat: Fix suspend/resume when the optional clk exists Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 1/7] usb: xhci: plat: Fix suspend/resume when the optional clk exists Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
csiph-web