Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4693057pxf; Tue, 30 Mar 2021 14:38:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxAFahFtRr9JPZH4h6Y/qANTq7GyW06KBDXkASjNnKegAyoyNHLfRdbDUb0Ya2YhYJ0v/d X-Received: by 2002:a05:6402:51d0:: with SMTP id r16mr35770244edd.48.1617140330150; Tue, 30 Mar 2021 14:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617140330; cv=none; d=google.com; s=arc-20160816; b=wD0FFSly3/vHadPnvNhLUtX5qZ78LP1O9T+koiTNL5BSClg/jVsS6O8ycRnp6iLTp+ 3sXy6Pwgx78/4kSL+CxImEvBYYM4tfbBftxiDrXIGK0kzQSYVCHkm+NuqUb+xNCbN56K yLrueKP4LUsYGi7ZGHh0quFdQfKJwRS2o4E5alhFe4+MDjGuvn7PVnKcCFfPb65lAGk+ MZjbuTBtqZ5P4AXOk5GNPtR/vIkMpiC8upltRg5i1asCsAw/xZHfRUpJGK7ivx8ZZOVC 3buguWia8bBaMXwpBQtNr6LvcUqtIF7/NAhP+L/Z1WpbwDbU3g6cWw/suC4nf4ruoInm LSgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from; bh=Drz8h0Tg89u0H6mGTBKfqIqYRrA63WHSl/TPntv4MUg=; b=RW4tB0km5C7wvEcVC9/5EikUPtkuYZUwrdv9TrKZ+J3GIbvtInQtKiC51Oxi+dz0o4 eeIE5XPUCpGhKJHmMYOUrNOEfZDv1r0zU3vDLJ3OzILL6sf1KCfzZGmT9XH8azfyyjvw AgjRIIFzv+uESIdTZ0xYi3Qz9wZMx3PvfVZnjdGTp1d4co/zAqVaQtLK7qqFWKsRoRGU VnIr4CMDDzXJUoVykZl7L5N11zNsvDl+OP7Z0VwVFwwOzWXtlQ1Na6OGOReLEmyNx5Ui ixYLnrptOatXDpZPBSqc/ZRZcm+Y5h1j0ytRh8Au4fAzjgshEQ4QtKu0DXKX6GrkkZwe KTwQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hisilicon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z8si163027edd.550.2021.03.30.14.38.27; Tue, 30 Mar 2021 14:38:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hisilicon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232606AbhC3VhN convert rfc822-to-8bit (ORCPT + 99 others); Tue, 30 Mar 2021 17:37:13 -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