Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp2005743rwb; Sat, 24 Sep 2022 00:57:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM54HTGCJ2bTnhjHD33jWOGoiDp/0nVPEwncbsKXwxf2UCph6MBgfccGUU1U0TBz4uWzA4Ve X-Received: by 2002:a17:90a:ec17:b0:202:6e66:750a with SMTP id l23-20020a17090aec1700b002026e66750amr13900199pjy.211.1664006248883; Sat, 24 Sep 2022 00:57:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664006248; cv=none; d=google.com; s=arc-20160816; b=t2QlG2LYBbhnUuOVlB5bGGAVT+gRTgHtxFV6WDrCmhaIDdwZhdrhysfnatRBT8c763 5bJer81j+npSzre55Y+ZpEVxY6+1BhdXJzfZPDyrpHi61ShK+VLsenuwnwdSH8fPyz/t E0h5bw0H090v1t8gI7eh+SCDuTIu5f4qWBY6BO31w4pSDt+vEemISgTCbbR2knbj6DhA X6Q8sXtB7toD6a7e0RaRi7/xGp6R2e62An5mkOjGMdW/eWf9co3qbzI1rAck5AoflSge cDUHebNfdyJp7ST7zs2zfZ/rIFxaQ51Zlw29ektdqVVj5HFdUNW7gYfR2eswWn/PHBNm eOrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uj4kFw1IK3l1MRqIXioooF+S7rIFwh9H0oTCUHSTtBw=; b=hgAbKGj+U7py7wb4R3IzJOKF2KsPdh0R999+zWxn7NUItFRfIHicqVf5d6RwAr2zQH KbWmRtAWmHT0ZIfa3oasTCwaWfQd/HmEmU6u7hJpiDL93obCJoijkjG58fCU0em7wDIV DHHQSOf33YX//1rQWR2Sf+TAmv+gfTcVLO0qK9Htyh5u9VLWTmPXJ+VFVRzKhwXGhE4z IDlc0UZWm8roDCPM6qL2HzJIoaBu1bxyACcmuhj58jQkIfo/zGcO5146pnxJMMA8wgfO Oq5vV8wyO/9UpLS1TES2K4PQYfu4D/39zJitMB3+emcy/tXpcy66h+Jio8JKj9rQGd/Q K5XA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ck3-20020a056a00328300b0053880afd2cdsi10716037pfb.119.2022.09.24.00.57.17; Sat, 24 Sep 2022 00:57:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233477AbiIXHYn (ORCPT + 99 others); Sat, 24 Sep 2022 03:24:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233419AbiIXHYU (ORCPT ); Sat, 24 Sep 2022 03:24:20 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C507F13D867; Sat, 24 Sep 2022 00:24:19 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MZL4P5ybfz4wqT; Sat, 24 Sep 2022 15:19:33 +0800 (CST) Received: from huawei.com (10.175.127.227) 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; Sat, 24 Sep 2022 15:24:17 +0800 From: Jason Yan To: , CC: , , , , , , , Jason Yan Subject: [PATCH v2 4/8] scsi: hisi_sas: use sas_find_attathed_phy() instead of open coded Date: Sat, 24 Sep 2022 15:34:51 +0800 Message-ID: <20220924073455.2186805-5-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220924073455.2186805-1-yanaijie@huawei.com> References: <20220924073455.2186805-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The attached phy finding is open coded. Now we can replace it with sas_find_attached_phy(). Signed-off-by: Jason Yan --- drivers/scsi/hisi_sas/hisi_sas_main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 33af5b8dede2..995ccb13fb9d 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -792,17 +792,9 @@ static int hisi_sas_dev_found(struct domain_device *device) if (parent_dev && dev_is_expander(parent_dev->dev_type)) { int phy_no; - u8 phy_num = parent_dev->ex_dev.num_phys; - struct ex_phy *phy; - for (phy_no = 0; phy_no < phy_num; phy_no++) { - phy = &parent_dev->ex_dev.ex_phy[phy_no]; - if (SAS_ADDR(phy->attached_sas_addr) == - SAS_ADDR(device->sas_addr)) - break; - } - - if (phy_no == phy_num) { + phy_no = sas_find_attached_phy(&parent_dev->ex_dev, device); + if (phy_no == -ENODEV) { dev_info(dev, "dev found: no attached " "dev:%016llx at ex:%016llx\n", SAS_ADDR(device->sas_addr), -- 2.31.1