| From 833b4136057f2df8e88868fa22bc6871af892cbd Mon Sep 17 00:00:00 2001 |
| From: Gregory CLEMENT <gregory.clement@bootlin.com> |
| Date: Fri, 20 Apr 2018 16:52:51 +0300 |
| Subject: [PATCH 0901/1795] usb: host: xhci-plat: Remove useless test before |
| clk_disable_unprepare |
| |
| clk_disable_unprepare() already checks that the clock pointer is valid. |
| No need to test it before calling it. |
| |
| Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 2d79609bf21eedb2142f9dff7d4af9919cd7399a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| 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 ea089fdda611..373caf024631 100644 |
| --- a/drivers/usb/host/xhci-plat.c |
| +++ b/drivers/usb/host/xhci-plat.c |
| @@ -320,8 +320,7 @@ static int xhci_plat_probe(struct platform_device *pdev) |
| 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); |
| @@ -347,8 +346,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); |
| |
| pm_runtime_set_suspended(&dev->dev); |
| -- |
| 2.19.0 |
| |
