i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk

For consistency with the rest of the file rename function and parameter to
be consistent with the reset of the common file.

Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Phil Reid <preid@electromag.com.au>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index b79f342..3d684c6 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -186,15 +186,15 @@ unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
        return dev->get_clk_rate_khz(dev);
 }
 
-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare)
 {
-       if (IS_ERR(i_dev->clk))
-               return PTR_ERR(i_dev->clk);
+       if (IS_ERR(dev->clk))
+               return PTR_ERR(dev->clk);
 
        if (prepare)
-               return clk_prepare_enable(i_dev->clk);
+               return clk_prepare_enable(dev->clk);
 
-       clk_disable_unprepare(i_dev->clk);
+       clk_disable_unprepare(dev->clk);
        return 0;
 }
 

diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index e80a14c..33c6c8f 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -301,7 +301,7 @@ u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset);
 void __i2c_dw_enable(struct dw_i2c_dev *dev, bool enable);
 void __i2c_dw_enable_and_wait(struct dw_i2c_dev *dev, bool enable);
 unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);
-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare);
+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare);
 int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);
 void i2c_dw_release_lock(struct dw_i2c_dev *dev);
 int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev);

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 6a3fd8d..6e0fd94 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -332,7 +332,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
                i2c_dw_configure_master(dev);
 
        dev->clk = devm_clk_get(&pdev->dev, NULL);
-       if (!i2c_dw_plat_prepare_clk(dev, true)) {
+       if (!i2c_dw_prepare_clk(dev, true)) {
                dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;
 
                if (!dev->sda_hold_time && ht)
@@ -436,7 +436,7 @@ static int dw_i2c_plat_suspend(struct device *dev)
        }
 
        i_dev->disable(i_dev);
-       i2c_dw_plat_prepare_clk(i_dev, false);
+       i2c_dw_prepare_clk(i_dev, false);
 
        i_dev->suspended = true;
 
@@ -455,7 +455,7 @@ static int dw_i2c_plat_resume(struct device *dev)
                return 0;
        }
 
-       i2c_dw_plat_prepare_clk(i_dev, true);
+       i2c_dw_prepare_clk(i_dev, true);
        i_dev->init(i_dev);
 
        i_dev->suspended = false;