redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

i2c: mv64xxx: use clk_{prepare_enable,disable_unprepare} 

Instead of separately calling clk_prepare()/clk_enable(), use
clk_prepare_enable(), and instead of calling
clk_disable()/clk_unprepare(), use clk_disable_unprepare(). Those
handy shortcuts have been introduced specifically to simplify the
numerous call sites were both functions were called in sequence.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
steinar/wifi_calib_4_9_kernel
Thomas Petazzoni 2016-04-22 15:19:53 +02:00 committed by Wolfram Sang
parent 9f4d6f1642
commit 70719350ca
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/i2c/busses/i2c-mv64xxx.c
View File

@ -912,10 +912,8 @@ mv64xxx_i2c_probe(struct platform_device *pd)
drv_data->clk = devm_clk_get(&pd->dev, NULL);
if (IS_ERR(drv_data->clk) && PTR_ERR(drv_data->clk) == -EPROBE_DEFER)
return -EPROBE_DEFER;
if (!IS_ERR(drv_data->clk)) {
clk_prepare(drv_data->clk);
clk_enable(drv_data->clk);
}
if (!IS_ERR(drv_data->clk))
clk_prepare_enable(drv_data->clk);
#endif
if (pdata) {
drv_data->freq_m = pdata->freq_m;
@ -968,10 +966,8 @@ exit_reset:
exit_clk:
#if defined(CONFIG_HAVE_CLK)
/* Not all platforms have a clk */
if (!IS_ERR(drv_data->clk)) {
clk_disable(drv_data->clk);
clk_unprepare(drv_data->clk);
}
if (!IS_ERR(drv_data->clk))
clk_disable_unprepare(drv_data->clk);
#endif
return rc;
}
@ -987,10 +983,8 @@ mv64xxx_i2c_remove(struct platform_device *dev)
reset_control_assert(drv_data->rstc);
#if defined(CONFIG_HAVE_CLK)
/* Not all platforms have a clk */
if (!IS_ERR(drv_data->clk)) {
clk_disable(drv_data->clk);
clk_unprepare(drv_data->clk);
}
if (!IS_ERR(drv_data->clk))
clk_disable_unprepare(drv_data->clk);
#endif
return 0;