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: tc6387xb: 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 7263bd39 21cf3318

+5 -5
+5 -5
drivers/mfd/tc6387xb.c
··· 52 52 53 53 if (pdata && pdata->suspend) 54 54 pdata->suspend(dev); 55 - clk_disable(tc6387xb->clk32k); 55 + clk_disable_unprepare(tc6387xb->clk32k); 56 56 57 57 return 0; 58 58 } ··· 62 62 struct tc6387xb *tc6387xb = platform_get_drvdata(dev); 63 63 struct tc6387xb_platform_data *pdata = dev_get_platdata(&dev->dev); 64 64 65 - clk_enable(tc6387xb->clk32k); 65 + clk_prepare_enable(tc6387xb->clk32k); 66 66 if (pdata && pdata->resume) 67 67 pdata->resume(dev); 68 68 ··· 100 100 struct platform_device *dev = to_platform_device(mmc->dev.parent); 101 101 struct tc6387xb *tc6387xb = platform_get_drvdata(dev); 102 102 103 - clk_enable(tc6387xb->clk32k); 103 + clk_prepare_enable(tc6387xb->clk32k); 104 104 105 105 tmio_core_mmc_enable(tc6387xb->scr + 0x200, 0, 106 106 tc6387xb_mmc_resources[0].start & 0xfffe); ··· 113 113 struct platform_device *dev = to_platform_device(mmc->dev.parent); 114 114 struct tc6387xb *tc6387xb = platform_get_drvdata(dev); 115 115 116 - clk_disable(tc6387xb->clk32k); 116 + clk_disable_unprepare(tc6387xb->clk32k); 117 117 118 118 return 0; 119 119 } ··· 214 214 mfd_remove_devices(&dev->dev); 215 215 iounmap(tc6387xb->scr); 216 216 release_resource(&tc6387xb->rscr); 217 - clk_disable(tc6387xb->clk32k); 217 + clk_disable_unprepare(tc6387xb->clk32k); 218 218 clk_put(tc6387xb->clk32k); 219 219 kfree(tc6387xb); 220 220