From: Andy Shevchenko <andriy.shevche...@linux.intel.com>

Use generic i2c_freq_mode_string() helper to print chosen bus speed.

Acked-by: Jarkko Nikula <jarkko.nik...@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Signed-off-by: Yicong Yang <yangyic...@hisilicon.com>
---
 drivers/i2c/busses/i2c-designware-master.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware-master.c 
b/drivers/i2c/busses/i2c-designware-master.c
index dd27b9d..b64c4c8 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -35,10 +35,10 @@ static void i2c_dw_configure_fifo_master(struct dw_i2c_dev 
*dev)
 
 static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)
 {
-       const char *mode_str, *fp_str = "";
        u32 comp_param1;
        u32 sda_falling_time, scl_falling_time;
        struct i2c_timings *t = &dev->timings;
+       const char *fp_str = "";
        u32 ic_clk;
        int ret;
 
@@ -153,22 +153,10 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev 
*dev)
 
        ret = i2c_dw_set_sda_hold(dev);
        if (ret)
-               goto out;
-
-       switch (dev->master_cfg & DW_IC_CON_SPEED_MASK) {
-       case DW_IC_CON_SPEED_STD:
-               mode_str = "Standard Mode";
-               break;
-       case DW_IC_CON_SPEED_HIGH:
-               mode_str = "High Speed Mode";
-               break;
-       default:
-               mode_str = "Fast Mode";
-       }
-       dev_dbg(dev->dev, "Bus speed: %s%s\n", mode_str, fp_str);
+               return ret;
 
-out:
-       return ret;
+       dev_dbg(dev->dev, "Bus speed: %s\n", 
i2c_freq_mode_string(t->bus_freq_hz));
+       return 0;
 }
 
 /**
-- 
2.8.1

Reply via email to