diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-10-28 18:49:26 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-11-26 11:35:08 -0500 |
commit | 989c78dd56307c85f710533130a2a464f6f3c5ae (patch) | |
tree | c6200a94377348cde10881ceead2d2251b7a1346 | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
usb: gadget: r8a66597-udc: convert to clk_prepare/unprepare
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>
-rw-r--r-- | drivers/usb/gadget/r8a66597-udc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c index 68be48d33404..47287518bff3 100644 --- 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) | |||
1833 | r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); | 1833 | r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); |
1834 | 1834 | ||
1835 | if (r8a66597->pdata->on_chip) { | 1835 | if (r8a66597->pdata->on_chip) { |
1836 | clk_disable(r8a66597->clk); | 1836 | clk_disable_unprepare(r8a66597->clk); |
1837 | clk_put(r8a66597->clk); | 1837 | clk_put(r8a66597->clk); |
1838 | } | 1838 | } |
1839 | 1839 | ||
@@ -1931,7 +1931,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) | |||
1931 | ret = PTR_ERR(r8a66597->clk); | 1931 | ret = PTR_ERR(r8a66597->clk); |
1932 | goto clean_up; | 1932 | goto clean_up; |
1933 | } | 1933 | } |
1934 | clk_enable(r8a66597->clk); | 1934 | clk_prepare_enable(r8a66597->clk); |
1935 | } | 1935 | } |
1936 | 1936 | ||
1937 | if (r8a66597->pdata->sudmac) { | 1937 | if (r8a66597->pdata->sudmac) { |
@@ -1996,7 +1996,7 @@ clean_up3: | |||
1996 | free_irq(irq, r8a66597); | 1996 | free_irq(irq, r8a66597); |
1997 | clean_up2: | 1997 | clean_up2: |
1998 | if (r8a66597->pdata->on_chip) { | 1998 | if (r8a66597->pdata->on_chip) { |
1999 | clk_disable(r8a66597->clk); | 1999 | clk_disable_unprepare(r8a66597->clk); |
2000 | clk_put(r8a66597->clk); | 2000 | clk_put(r8a66597->clk); |
2001 | } | 2001 | } |
2002 | clean_up: | 2002 | clean_up: |