Skip to content

Commit

Permalink
usb: gadget: r8a66597-udc: convert to clk_prepare/unprepare
Browse files Browse the repository at this point in the history
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
clk_disable_unprepare() to get ready for the migration to the common
clock framework.

Cc: Felipe Balbi <balbi@ti.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Laurent Pinchart authored and Felipe Balbi committed Nov 26, 2013
1 parent 6ce4eac commit 989c78d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/gadget/r8a66597-udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -1996,7 +1996,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
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:
Expand Down

0 comments on commit 989c78d

Please sign in to comment.