Commit f0ed7bd5 authored by Jason Yan's avatar Jason Yan Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Use sas_find_attathed_phy_id() instead of open coding it 



The attached phy finding is open coded. Replace it with
sas_find_attached_phy_id(). To keep things consistent, the return value of
hisi_sas_dev_found() is also changed to -ENODEV after calling
sas_find_attathed_phy_id() failed.

Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Link: https://lore.kernel.org/r/20220928070130.3657183-6-yanaijie@huawei.com


Reviewed-by: default avatarJack Wang <jinpu.wang@ionos.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Acked-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 178c39d9

drivers/scsi/hisi_sas/hisi_sas_main.c

+3 −11
Original line number Diff line number Diff line
@@ -792,22 +792,14 @@ 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_id(&parent_dev->ex_dev, device);

		if (phy_no < 0) {

			dev_info(dev, "dev found: no attached "

				 "dev:%016llx at ex:%016llx\n",

				 SAS_ADDR(device->sas_addr),

				 SAS_ADDR(parent_dev->sas_addr));

			rc = -EINVAL;

			rc = phy_no;

			goto err_out;

		}

	}