From: Lukasz Majewski Date: Fri, 4 May 2012 12:17:15 +0000 (+0200) Subject: usb:hsotg:samsung: Use clk_prepare_enable and clk_disable_unprepare X-Git-Tag: v3.12-rc1~3153^2~139^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04b4a0fce530eab728e27e24b5a8d6192c6f70d9;p=kernel%2Fkernel-generic.git usb:hsotg:samsung: Use clk_prepare_enable and clk_disable_unprepare This commit adjust the s3c-hsotg to new clock API. Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 34599df..1cac0be 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -3547,7 +3547,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev) /* reset the system */ - clk_enable(hsotg->clk); + clk_prepare_enable(hsotg->clk); /* regulators */ @@ -3645,7 +3645,7 @@ err_supplies: regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); - clk_disable(hsotg->clk); + clk_disable_unprepare(hsotg->clk); clk_put(hsotg->clk); err_regs: @@ -3687,7 +3687,7 @@ static int __devexit s3c_hsotg_remove(struct platform_device *pdev) s3c_hsotg_phy_disable(hsotg); regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); - clk_disable(hsotg->clk); + clk_disable_unprepare(hsotg->clk); clk_put(hsotg->clk); device_unregister(&hsotg->gadget.dev);