i2c: designware: Switch over to i2c_freq_mode_string()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 8 Apr 2021 11:17:21 +0000 (19:17 +0800)
committerWolfram Sang <wsa@kernel.org>
Sat, 10 Apr 2021 19:54:11 +0000 (21:54 +0200)
Use generic i2c_freq_mode_string() helper to print chosen bus speed.

Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-designware-master.c

index 8a59470a82ad603104ab683257819144af21f4cc..ceae6b2fed830fb9a5fa8512dd0ee464bc86ca36 100644 (file)
@@ -39,10 +39,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;
 
@@ -157,22 +157,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;
 }
 
 /**