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

scsi: mvsas: Use sas_find_attached_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
mvs_dev_found_notify() 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-5-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>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ec648586

drivers/scsi/mvsas/mv_sas.c

+5 −12
Original line number Diff line number Diff line
@@ -1190,23 +1190,16 @@ static int mvs_dev_found_notify(struct domain_device *dev, int lock) 
	mvi_device->sas_device = dev;

	if (parent_dev && dev_is_expander(parent_dev->dev_type)) {

		int phy_id;

		u8 phy_num = parent_dev->ex_dev.num_phys;

		struct ex_phy *phy;

		for (phy_id = 0; phy_id < phy_num; phy_id++) {

			phy = &parent_dev->ex_dev.ex_phy[phy_id];

			if (SAS_ADDR(phy->attached_sas_addr) ==

				SAS_ADDR(dev->sas_addr)) {

				mvi_device->attached_phy = phy_id;

				break;

			}

		}



		if (phy_id == phy_num) {

		phy_id = sas_find_attached_phy_id(&parent_dev->ex_dev, dev);

		if (phy_id < 0) {

			mv_printk("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;

		} else {

			mvi_device->attached_phy = phy_id;

		}

	}