Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b547a88 authored Oct 28, 2013 by Laurent Pinchart Committed by Simon Horman Nov 28, 2013

usb: r8a66597-hcd: 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: linux-usb@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent 6ce4eac1

drivers/usb/host/r8a66597-hcd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
		int i = 0;

		if (r8a66597->pdata->on_chip) {
		clk_enable(r8a66597->clk);
		clk_prepare_enable(r8a66597->clk);
		do {
		r8a66597_write(r8a66597, SCKE, SYSCFG0);
		tmp = r8a66597_read(r8a66597, SYSCFG0);
		@@ -139,7 +139,7 @@ static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
		udelay(1);

		if (r8a66597->pdata->on_chip) {
		clk_disable(r8a66597->clk);
		clk_disable_unprepare(r8a66597->clk);
		} else {
		r8a66597_bclr(r8a66597, PLLC, SYSCFG0);
		r8a66597_bclr(r8a66597, XCKE, SYSCFG0);