usb: gadget: r8a66597-udc: convert to clk_prepare/unprepare

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / r8a66597-udc.c

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index c6af649f324008bb31706baecac5d91497a27cd7..47287518bff3d9dfe3d666d46a66dfc2fa82ffb3 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1833,7 +1833,7 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
        r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
 
        if (r8a66597->pdata->on_chip) {
-               clk_disable(r8a66597->clk);
+               clk_disable_unprepare(r8a66597->clk);
                clk_put(r8a66597->clk);
        }
 
@@ -1910,7 +1910,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 
        spin_lock_init(&r8a66597->lock);
        platform_set_drvdata(pdev, r8a66597);
-       r8a66597->pdata = pdev->dev.platform_data;
+       r8a66597->pdata = dev_get_platdata(&pdev->dev);
        r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;
 
        r8a66597->gadget.ops = &r8a66597_gadget_ops;
@@ -1931,7 +1931,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
                        ret = PTR_ERR(r8a66597->clk);
                        goto clean_up;
                }
-               clk_enable(r8a66597->clk);
+               clk_prepare_enable(r8a66597->clk);
        }
 
        if (r8a66597->pdata->sudmac) {
@@ -1996,7 +1996,7 @@ clean_up3:
        free_irq(irq, r8a66597);
 clean_up2:
        if (r8a66597->pdata->on_chip) {
-               clk_disable(r8a66597->clk);
+               clk_disable_unprepare(r8a66597->clk);
                clk_put(r8a66597->clk);
        }
 clean_up: