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

scsi: pm8001: Use sas_find_attached_phy_id() instead of open coding it 



The attached phy id finding is open coded. Replace it with
sas_find_attached_phy_id(). To keep things 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: default avatarJason Yan <yanaijie@huawei.com>
Link: https://lore.kernel.org/r/20220928070130.3657183-4-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 2d08f329

drivers/scsi/pm8001/pm8001_sas.c

+6 −12
Original line number Diff line number Diff line
@@ -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 < 0) {

			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;

		} else {

			pm8001_device->attached_phy = phy_id;

		}

	} else {

		if (dev->dev_type == SAS_SATA_DEV) {