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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48D98C07E9D for ; Wed, 28 Sep 2022 02:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231965AbiI1CRM (ORCPT ); Tue, 27 Sep 2022 22:17:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232326AbiI1CRJ (ORCPT ); Tue, 27 Sep 2022 22:17:09 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E99D7D62CF; Tue, 27 Sep 2022 19:17:06 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mcg4134bNzHtlN; Wed, 28 Sep 2022 10:12:17 +0800 (CST) Received: from [10.174.179.14] (10.174.179.14) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 10:17:02 +0800 Subject: Re: [PATCH v5 3/8] scsi: pm8001: use sas_find_attached_phy_id() instead of open coded To: Damien Le Moal , , CC: , , , , , , , Jack Wang References: <20220927123926.953297-1-yanaijie@huawei.com> <20220927123926.953297-4-yanaijie@huawei.com> From: Jason Yan Message-ID: Date: Wed, 28 Sep 2022 10:17:02 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.14] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/9/28 6:57, Damien Le Moal wrote: > On 9/27/22 21:39, Jason Yan wrote: >> The attached phy id finding is open coded. Now we can replace it with >> sas_find_attached_phy_id(). To keep consistent, the return value of >> pm8001_dev_found_notify() is also changed to -ENODEV after calling >> sas_find_attathed_phy_id() failed. >> >> Signed-off-by: Jason Yan >> Reviewed-by: Jack Wang >> Reviewed-by: Damien Le Moal >> --- >> drivers/scsi/pm8001/pm8001_sas.c | 18 ++++++------------ >> 1 file changed, 6 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c >> index 8e3f2f9ddaac..042c0843de1a 100644 >> --- a/drivers/scsi/pm8001/pm8001_sas.c >> +++ b/drivers/scsi/pm8001/pm8001_sas.c >> @@ -645,22 +645,16 @@ static int pm8001_dev_found_notify(struct domain_device *dev) >> pm8001_device->dcompletion = &completion; >> if (parent_dev && dev_is_expander(parent_dev->dev_type)) { >> int phy_id; >> - struct ex_phy *phy; >> - for (phy_id = 0; phy_id < parent_dev->ex_dev.num_phys; >> - phy_id++) { >> - phy = &parent_dev->ex_dev.ex_phy[phy_id]; >> - if (SAS_ADDR(phy->attached_sas_addr) >> - == SAS_ADDR(dev->sas_addr)) { >> - pm8001_device->attached_phy = phy_id; >> - break; >> - } >> - } >> - if (phy_id == parent_dev->ex_dev.num_phys) { >> + >> + phy_id = sas_find_attached_phy_id(&parent_dev->ex_dev, dev); >> + if (phy_id == -ENODEV) { >> pm8001_dbg(pm8001_ha, FAIL, >> "Error: no attached dev:%016llx at ex:%016llx.\n", >> SAS_ADDR(dev->sas_addr), >> SAS_ADDR(parent_dev->sas_addr)); >> - res = -1; >> + res = phy_id; > > Nit: > > res = -ENODEV would be a lot clearer. > Or do: > > if (phy_id < 0) { > ... > ret = phy_id; > } ... > This boils down to personal preferences. I'd like to change to the latter one if no objections. Thanks, Jason > No ? > >> + } else { >> + pm8001_device->attached_phy = phy_id; >> } >> } else { >> if (dev->dev_type == SAS_SATA_DEV) { >