Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB ehci mxc: prepare/unprepare clock

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

+9 -9
+9 -9
drivers/usb/host/ehci-mxc.c
··· 171 171 ret = PTR_ERR(priv->usbclk); 172 172 goto err_clk; 173 173 } 174 - clk_enable(priv->usbclk); 174 + clk_prepare_enable(priv->usbclk); 175 175 176 176 if (!cpu_is_mx35() && !cpu_is_mx25()) { 177 177 priv->ahbclk = clk_get(dev, "usb_ahb"); ··· 179 179 ret = PTR_ERR(priv->ahbclk); 180 180 goto err_clk_ahb; 181 181 } 182 - clk_enable(priv->ahbclk); 182 + clk_prepare_enable(priv->ahbclk); 183 183 } 184 184 185 185 /* "dr" device has its own clock on i.MX51 */ ··· 189 189 ret = PTR_ERR(priv->phy1clk); 190 190 goto err_clk_phy; 191 191 } 192 - clk_enable(priv->phy1clk); 192 + clk_prepare_enable(priv->phy1clk); 193 193 } 194 194 195 195 ··· 266 266 pdata->exit(pdev); 267 267 err_init: 268 268 if (priv->phy1clk) { 269 - clk_disable(priv->phy1clk); 269 + clk_disable_unprepare(priv->phy1clk); 270 270 clk_put(priv->phy1clk); 271 271 } 272 272 err_clk_phy: 273 273 if (priv->ahbclk) { 274 - clk_disable(priv->ahbclk); 274 + clk_disable_unprepare(priv->ahbclk); 275 275 clk_put(priv->ahbclk); 276 276 } 277 277 err_clk_ahb: 278 - clk_disable(priv->usbclk); 278 + clk_disable_unprepare(priv->usbclk); 279 279 clk_put(priv->usbclk); 280 280 err_clk: 281 281 iounmap(hcd->regs); ··· 307 307 usb_put_hcd(hcd); 308 308 platform_set_drvdata(pdev, NULL); 309 309 310 - clk_disable(priv->usbclk); 310 + clk_disable_unprepare(priv->usbclk); 311 311 clk_put(priv->usbclk); 312 312 if (priv->ahbclk) { 313 - clk_disable(priv->ahbclk); 313 + clk_disable_unprepare(priv->ahbclk); 314 314 clk_put(priv->ahbclk); 315 315 } 316 316 if (priv->phy1clk) { 317 - clk_disable(priv->phy1clk); 317 + clk_disable_unprepare(priv->phy1clk); 318 318 clk_put(priv->phy1clk); 319 319 } 320 320