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

mfd: t7l66xb: prepare/unprepare clocks

Change clk_enable/disable() calls to clk_prepare_enable() and
clk_disable_unprepare().

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

authored by

Dmitry Eremin-Solenikov and committed by
Lee Jones 71d679b8 7263bd39

+7 -7
+7 -7
drivers/mfd/t7l66xb.c
··· 87 87 unsigned long flags; 88 88 u8 dev_ctl; 89 89 90 - clk_enable(t7l66xb->clk32k); 90 + clk_prepare_enable(t7l66xb->clk32k); 91 91 92 92 spin_lock_irqsave(&t7l66xb->lock, flags); 93 93 ··· 118 118 119 119 spin_unlock_irqrestore(&t7l66xb->lock, flags); 120 120 121 - clk_disable(t7l66xb->clk32k); 121 + clk_disable_unprepare(t7l66xb->clk32k); 122 122 123 123 return 0; 124 124 } ··· 285 285 286 286 if (pdata && pdata->suspend) 287 287 pdata->suspend(dev); 288 - clk_disable(t7l66xb->clk48m); 288 + clk_disable_unprepare(t7l66xb->clk48m); 289 289 290 290 return 0; 291 291 } ··· 295 295 struct t7l66xb *t7l66xb = platform_get_drvdata(dev); 296 296 struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev); 297 297 298 - clk_enable(t7l66xb->clk48m); 298 + clk_prepare_enable(t7l66xb->clk48m); 299 299 if (pdata && pdata->resume) 300 300 pdata->resume(dev); 301 301 ··· 369 369 goto err_ioremap; 370 370 } 371 371 372 - clk_enable(t7l66xb->clk48m); 372 + clk_prepare_enable(t7l66xb->clk48m); 373 373 374 374 if (pdata && pdata->enable) 375 375 pdata->enable(dev); ··· 414 414 int ret; 415 415 416 416 ret = pdata->disable(dev); 417 - clk_disable(t7l66xb->clk48m); 417 + clk_disable_unprepare(t7l66xb->clk48m); 418 418 clk_put(t7l66xb->clk48m); 419 - clk_disable(t7l66xb->clk32k); 419 + clk_disable_unprepare(t7l66xb->clk32k); 420 420 clk_put(t7l66xb->clk32k); 421 421 t7l66xb_detach_irq(dev); 422 422 iounmap(t7l66xb->scr);