From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50F07C433E1 for ; Tue, 30 Mar 2021 21:37:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1BFE061953 for ; Tue, 30 Mar 2021 21:37:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232640AbhC3VhO convert rfc822-to-8bit (ORCPT ); Tue, 30 Mar 2021 17:37:14 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:5116 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232641AbhC3Vgr (ORCPT ); Tue, 30 Mar 2021 17:36:47 -0400 Received: from DGGEML401-HUB.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4F92ll0CTWzYQFB; Wed, 31 Mar 2021 05:34:43 +0800 (CST) Received: from dggema774-chm.china.huawei.com (10.1.198.216) by DGGEML401-HUB.china.huawei.com (10.3.17.32) with Microsoft SMTP Server (TLS) id 14.3.498.0; Wed, 31 Mar 2021 05:36:37 +0800 Received: from dggemi761-chm.china.huawei.com (10.1.198.147) by dggema774-chm.china.huawei.com (10.1.198.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2106.2; Wed, 31 Mar 2021 05:36:37 +0800 Received: from dggemi761-chm.china.huawei.com ([10.9.49.202]) by dggemi761-chm.china.huawei.com ([10.9.49.202]) with mapi id 15.01.2106.013; Wed, 31 Mar 2021 05:36:37 +0800 From: "Song Bao Hua (Barry Song)" To: yangyicong , "wsa@kernel.org" , "andriy.shevchenko@linux.intel.com" , "linux-i2c@vger.kernel.org" , "Sergey.Semin@baikalelectronics.ru" , "linux-kernel@vger.kernel.org" CC: "digetx@gmail.com" , "treding@nvidia.com" , "jarkko.nikula@linux.intel.com" , "rmk+kernel@armlinux.org.uk" , John Garry , "mika.westerberg@linux.intel.com" , "Zengtao (B)" , Linuxarm Subject: RE: [PATCH 5/5] i2c: designware: Switch over to i2c_freq_mode_string() Thread-Topic: [PATCH 5/5] i2c: designware: Switch over to i2c_freq_mode_string() Thread-Index: AQHXJXAQhX+a0hiUXkCpTQNzS4ZJoKqdC6Iw Date: Tue, 30 Mar 2021 21:36:36 +0000 Message-ID: References: <1617113966-40498-1-git-send-email-yangyicong@hisilicon.com> <1617113966-40498-6-git-send-email-yangyicong@hisilicon.com> In-Reply-To: <1617113966-40498-6-git-send-email-yangyicong@hisilicon.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.126.202.63] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: yangyicong > Sent: Wednesday, March 31, 2021 3:19 AM > To: wsa@kernel.org; andriy.shevchenko@linux.intel.com; > linux-i2c@vger.kernel.org; Sergey.Semin@baikalelectronics.ru; > linux-kernel@vger.kernel.org > Cc: digetx@gmail.com; treding@nvidia.com; jarkko.nikula@linux.intel.com; > rmk+kernel@armlinux.org.uk; Song Bao Hua (Barry Song) > ; John Garry ; > mika.westerberg@linux.intel.com; yangyicong ; Zengtao > (B) ; Linuxarm > Subject: [PATCH 5/5] i2c: designware: Switch over to i2c_freq_mode_string() > > From: Andy Shevchenko > > Use generic i2c_freq_mode_string() helper to print chosen bus speed. > > Signed-off-by: Andy Shevchenko > Signed-off-by: Yicong Yang > --- > 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)); Weird the original code was printing both mode and fp. And you are printing mode only. > + return 0; > } > > /** > -- > 2.8.1