The attached phy finding is open coded. Now we can replace it with
sas_find_attached_phy().
Signed-off-by: Jason Yan <[email protected]>
Reviewed-by: Jack Wang <[email protected]>
---
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
On 9/27/22 11:29, Jason Yan wrote:
> The attached phy finding is open coded. Now we can replace it with
> sas_find_attached_phy().
>
> Signed-off-by: Jason Yan <[email protected]>
> Reviewed-by: Jack Wang <[email protected]>
Reviewed-by: Damien Le Moal <[email protected]>
> ---
> 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),
--
Damien Le Moal
Western Digital Research