| Message ID | 20210929025807.646589-1-ipylypiv@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] scsi: pm80xx: Replace open coded check with dev_is_expander() | expand |
On Wed, Sep 29, 2021 at 4:58 AM Igor Pylypiv <ipylypiv@google.com> wrote: > > This is a follow up cleanup to the commit 924a3541eab0 ("scsi: libsas: > aic94xx: hisi_sas: mvsas: pm8001: Use dev_is_expander()") > > Reviewed-by: Vishakha Channapattan <vishakhavc@google.com> > Signed-off-by: Igor Pylypiv <ipylypiv@google.com> Acked-by: Jack Wang <jinpu.wang@ionos.com> > --- > drivers/scsi/pm8001/pm8001_hwi.c | 3 +-- > drivers/scsi/pm8001/pm80xx_hwi.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c > index 63690508313b..b73d286bea60 100644 > --- a/drivers/scsi/pm8001/pm8001_hwi.c > +++ b/drivers/scsi/pm8001/pm8001_hwi.c > @@ -4476,8 +4476,7 @@ static int pm8001_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, > if (pm8001_dev->dev_type == SAS_SATA_DEV) > stp_sspsmp_sata = 0x00; /* stp*/ > else if (pm8001_dev->dev_type == SAS_END_DEVICE || > - pm8001_dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || > - pm8001_dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE) > + dev_is_expander(pm8001_dev->dev_type)) > stp_sspsmp_sata = 0x01; /*ssp or smp*/ > } > if (parent_dev && dev_is_expander(parent_dev->dev_type)) > diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c > index 6ffe17b849ae..778b5fce876b 100644 > --- a/drivers/scsi/pm8001/pm80xx_hwi.c > +++ b/drivers/scsi/pm8001/pm80xx_hwi.c > @@ -4825,8 +4825,7 @@ static int pm80xx_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, > if (pm8001_dev->dev_type == SAS_SATA_DEV) > stp_sspsmp_sata = 0x00; /* stp*/ > else if (pm8001_dev->dev_type == SAS_END_DEVICE || > - pm8001_dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || > - pm8001_dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE) > + dev_is_expander(pm8001_dev->dev_type)) > stp_sspsmp_sata = 0x01; /*ssp or smp*/ > } > if (parent_dev && dev_is_expander(parent_dev->dev_type)) > -- > 2.33.0.685.g46640cef36-goog >
Igor, > This is a follow up cleanup to the commit 924a3541eab0 ("scsi: libsas: > aic94xx: hisi_sas: mvsas: pm8001: Use dev_is_expander()") Applied 1+2 to 5.16/scsi-staging, thanks!
On Tue, 28 Sep 2021 19:58:07 -0700, Igor Pylypiv wrote: > This is a follow up cleanup to the commit 924a3541eab0 ("scsi: libsas: > aic94xx: hisi_sas: mvsas: pm8001: Use dev_is_expander()") > > Applied to 5.16/scsi-queue, thanks! [1/2] scsi: pm80xx: Replace open coded check with dev_is_expander() https://git.kernel.org/mkp/scsi/c/4f632918e7a8
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 63690508313b..b73d286bea60 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -4476,8 +4476,7 @@ static int pm8001_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, if (pm8001_dev->dev_type == SAS_SATA_DEV) stp_sspsmp_sata = 0x00; /* stp*/ else if (pm8001_dev->dev_type == SAS_END_DEVICE || - pm8001_dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || - pm8001_dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE) + dev_is_expander(pm8001_dev->dev_type)) stp_sspsmp_sata = 0x01; /*ssp or smp*/ } if (parent_dev && dev_is_expander(parent_dev->dev_type)) diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index 6ffe17b849ae..778b5fce876b 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -4825,8 +4825,7 @@ static int pm80xx_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, if (pm8001_dev->dev_type == SAS_SATA_DEV) stp_sspsmp_sata = 0x00; /* stp*/ else if (pm8001_dev->dev_type == SAS_END_DEVICE || - pm8001_dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || - pm8001_dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE) + dev_is_expander(pm8001_dev->dev_type)) stp_sspsmp_sata = 0x01; /*ssp or smp*/ } if (parent_dev && dev_is_expander(parent_dev->dev_type))
This is a follow up cleanup to the commit 924a3541eab0 ("scsi: libsas: aic94xx: hisi_sas: mvsas: pm8001: Use dev_is_expander()") Reviewed-by: Vishakha Channapattan <vishakhavc@google.com> Signed-off-by: Igor Pylypiv <ipylypiv@google.com> --- drivers/scsi/pm8001/pm8001_hwi.c | 3 +-- drivers/scsi/pm8001/pm80xx_hwi.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)