usb: gadget: s3c2410: Move to clk_prepare_enable/clk_disable_unprepare
authorVasily Khoruzhick <anarsoul@gmail.com>
Mon, 30 Jun 2014 19:13:29 +0000 (22:13 +0300)
committerFelipe Balbi <balbi@ti.com>
Mon, 30 Jun 2014 19:28:47 +0000 (14:28 -0500)
Use clk_prepare_enable/clk_disable_unprepare to make the driver
work properly with common clock framework.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/s3c2410_udc.c

index 7987aa049fab2ba62781dcca616bb2917cfe56e2..357b58e0087bb285bc6a2bd69f2ca0baaff6068c 100644 (file)
@@ -1788,7 +1788,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
                return PTR_ERR(usb_bus_clock);
        }
 
-       clk_enable(usb_bus_clock);
+       clk_prepare_enable(usb_bus_clock);
 
        udc_clock = clk_get(NULL, "usb-device");
        if (IS_ERR(udc_clock)) {
@@ -1796,7 +1796,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
                return PTR_ERR(udc_clock);
        }
 
-       clk_enable(udc_clock);
+       clk_prepare_enable(udc_clock);
 
        mdelay(10);
 
@@ -1952,13 +1952,13 @@ static int s3c2410_udc_remove(struct platform_device *pdev)
        release_mem_region(rsrc_start, rsrc_len);
 
        if (!IS_ERR(udc_clock) && udc_clock != NULL) {
-               clk_disable(udc_clock);
+               clk_disable_unprepare(udc_clock);
                clk_put(udc_clock);
                udc_clock = NULL;
        }
 
        if (!IS_ERR(usb_bus_clock) && usb_bus_clock != NULL) {
-               clk_disable(usb_bus_clock);
+               clk_disable_unprepare(usb_bus_clock);
                clk_put(usb_bus_clock);
                usb_bus_clock = NULL;
        }