From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from canpmsgout11.his.huawei.com (canpmsgout11.his.huawei.com [113.46.200.226]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C709E23BD06; Tue, 23 Jun 2026 02:43:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.226 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782182591; cv=none; b=GlGDk6i6McCgf0ZrX3GQJBoLzCs3vb7H5LVV9xbhmRvU+e32OyU6m0vtgpeA1IM2bN+HGH6B3FcLGippGzyWoj0WHLW1GT9owQlj2e3S6BknK0XGXx4QbpQg6P0QtpaeGaZXVpiagEljdrC5vSlbgI+TaJGOcAuTEtL4CYzowAQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782182591; c=relaxed/simple; bh=6M+FwioNSh33vD24Nkbbg03/wbosNatONOMme+5Xq5Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QqQoGB4KszuZ/IYOox23I9qFJseFQkzP6TSGT034wxcLfrWdi+fYBIDmwQucG5FsFMn6wpRfcDkMTdn/cQJVLWf/iB7Xkv7DKFQ20UWpFbV8ULWxxfVXsD1jbtjAXiHRLJqLU647cg00rUhaHF2fUiiIybtBTH4eLp+GrWOLSok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=h-partners.com; dkim=pass (1024-bit key) header.d=h-partners.com header.i=@h-partners.com header.b=irRNCazI; arc=none smtp.client-ip=113.46.200.226 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=h-partners.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=h-partners.com header.i=@h-partners.com header.b="irRNCazI" dkim-signature: v=1; a=rsa-sha256; d=h-partners.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=HW3S65B5az59s2WVMskiPhsafx88KZhGe3pvAKJVCZQ=; b=irRNCazI9iUZVYUn5AI0pTfj/DyDLCOUkx+Va3FTdAepF6aypcGnsxgUyIzUBybHKgh9tfu0N ma2ZOwEfozSfMAtDZ5QjPdylKU5YZLVagDZWR8cublOecupEH2aG6jbdQdYMcmCwYs5pDxrcBVS fL3A7IRGwaSLuXhdKM2Bha4= Received: from mail.maildlp.com (unknown [172.19.163.214]) by canpmsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4gkq0j11XZzKm57; Tue, 23 Jun 2026 10:35:01 +0800 (CST) Received: from kwepemj100018.china.huawei.com (unknown [7.202.194.12]) by mail.maildlp.com (Postfix) with ESMTPS id A2A7240561; Tue, 23 Jun 2026 10:43:05 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by kwepemj100018.china.huawei.com (7.202.194.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.36; Tue, 23 Jun 2026 10:43:05 +0800 From: Xingui Yang To: , , , CC: , , , , , , Subject: [PATCH v8 1/2] scsi: libsas: refactor sas_ex_to_ata() using new helper sas_ex_to_dev() Date: Tue, 23 Jun 2026 10:43:03 +0800 Message-ID: <20260623024304.714582-2-yangxingui@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260623024304.714582-1-yangxingui@huawei.com> References: <20260623024304.714582-1-yangxingui@huawei.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemj100018.china.huawei.com (7.202.194.12) Introduce sas_ex_to_dev() to return any device type attached to an expander phy. The new helper is then used by sas_ex_to_ata() to reduce code duplication. Also add a defensive NULL check for ex_dev to guard against callers passing a NULL device. Signed-off-by: Xingui Yang --- drivers/scsi/libsas/sas_expander.c | 18 +++++++++++++----- drivers/scsi/libsas/sas_internal.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index f471ab464a78..cb9d3b748222 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -345,13 +345,15 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, SAS_ADDR(phy->attached_sas_addr), type); } -/* check if we have an existing attached ata device on this expander phy */ -struct domain_device *sas_ex_to_ata(struct domain_device *ex_dev, int phy_id) +struct domain_device *sas_ex_to_dev(struct domain_device *ex_dev, int phy_id) { - struct ex_phy *ex_phy = &ex_dev->ex_dev.ex_phy[phy_id]; - struct domain_device *dev; + struct ex_phy *ex_phy; struct sas_rphy *rphy; + if (!ex_dev) + return NULL; + + ex_phy = &ex_dev->ex_dev.ex_phy[phy_id]; if (!ex_phy->port) return NULL; @@ -359,7 +361,13 @@ struct domain_device *sas_ex_to_ata(struct domain_device *ex_dev, int phy_id) if (!rphy) return NULL; - dev = sas_find_dev_by_rphy(rphy); + return sas_find_dev_by_rphy(rphy); +} + +/* check if we have an existing attached ata device on this expander phy */ +struct domain_device *sas_ex_to_ata(struct domain_device *ex_dev, int phy_id) +{ + struct domain_device *dev = sas_ex_to_dev(ex_dev, phy_id); if (dev && dev_is_sata(dev)) return dev; diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index 7dce0f587149..350a70484bde 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -91,6 +91,7 @@ int sas_smp_get_phy_events(struct sas_phy *phy); void sas_device_set_phy(struct domain_device *dev, struct sas_port *port); struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy); +struct domain_device *sas_ex_to_dev(struct domain_device *ex_dev, int phy_id); struct domain_device *sas_ex_to_ata(struct domain_device *ex_dev, int phy_id); int sas_ex_phy_discover(struct domain_device *dev, int single); int sas_get_report_phy_sata(struct domain_device *dev, int phy_id, -- 2.43.0