@@ -308,25 +308,15 @@ static void dw_i2c_plat_complete(struct device *dev)
#endif
#ifdef CONFIG_PM
-static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
-{
- if (IS_ERR(i_dev->clk))
- return PTR_ERR(i_dev->clk);
-
- if (prepare)
- return clk_prepare_enable(i_dev->clk);
-
- clk_disable_unprepare(i_dev->clk);
- return 0;
-}
-
static int dw_i2c_plat_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev);
i2c_dw_disable(i_dev);
- i2c_dw_plat_prepare_clk(i_dev, false);
+
+ if (!IS_ERR(i_dev->clk))
+ clk_disable_unprepare(i_dev->clk);
return 0;
}
@@ -335,10 +325,15 @@ static int dw_i2c_plat_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev);
+ int ret;
- i2c_dw_plat_prepare_clk(i_dev, true);
- i2c_dw_init(i_dev);
+ if (!IS_ERR(i_dev->clk)) {
+ ret = clk_prepare_enable(i_dev->clk);
+ if (ret)
+ return ret;
+ }
+ i2c_dw_init(i_dev);
return 0;
}
As clk_prepare_enable() can fail, let's not ignore the error in the ->runtime_resume() callback, but instead propagate it. This change decreases the callers of i2c_dw_plat_prepare_clk() down to one, which seems like a justification of removing it. Instead let's call clk_disable_unprepare() directly when needed. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/i2c/busses/i2c-designware-platdrv.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)