OSDN Git Service

usb: ohci-ep93xx: use devm_clk_get()
authorH Hartley Sweeten <hartleys@visionengravers.com>
Mon, 1 Jul 2013 22:52:59 +0000 (15:52 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2013 20:54:29 +0000 (13:54 -0700)
Use devm_clk_get() to make the code a bit cleaner and simpler.

This also fixes a bug where a clk_put() is not done if usb_add_hcd()
fails.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-ep93xx.c

index b4f5e64..28fa6b8 100644 (file)
@@ -69,9 +69,8 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,
                goto err_put_hcd;
        }
 
-       usb_host_clock = clk_get(&pdev->dev, NULL);
+       usb_host_clock = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(usb_host_clock)) {
-               dev_dbg(&pdev->dev, "clk_get failed\n");
                retval = PTR_ERR(usb_host_clock);
                goto err_put_hcd;
        }
@@ -96,7 +95,6 @@ static void usb_hcd_ep93xx_remove(struct usb_hcd *hcd,
 {
        usb_remove_hcd(hcd);
        ep93xx_stop_hc(&pdev->dev);
-       clk_put(usb_host_clock);
        usb_put_hcd(hcd);
 }