| Message ID | 20190329234423.5611-2-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: pm8001: clean up code and fix spelling mistakes | expand |
On Sat, Mar 30, 2019 at 12:44 AM Colin King <colin.king@canonical.com> wrote: > > From: Colin Ian King <colin.king@canonical.com> > > When macro PM8001_USE_MSIX is defined there is redundant dead code > call to pm8001_cr32. Clean this up for the defined PM8001_USE_MSIX and > undefined PM8001_USE_MSIX cases. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Thanks, Colin, Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com> > --- > drivers/scsi/pm8001/pm8001_hwi.c | 7 ++++--- > drivers/scsi/pm8001/pm80xx_hwi.c | 7 ++++--- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c > index e4209091c1da..434498a78946 100644 > --- a/drivers/scsi/pm8001/pm8001_hwi.c > +++ b/drivers/scsi/pm8001/pm8001_hwi.c > @@ -4625,15 +4625,16 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, > > static u32 pm8001_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha) > { > - u32 value; > #ifdef PM8001_USE_MSIX > return 1; > -#endif > +#else > + u32 value; > + > value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR); > if (value) > return 1; > return 0; > - > +#endif > } > > /** > diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c > index 536d2b4384f8..4a176e60307f 100644 > --- a/drivers/scsi/pm8001/pm80xx_hwi.c > +++ b/drivers/scsi/pm8001/pm80xx_hwi.c > @@ -4619,15 +4619,16 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, > > static u32 pm80xx_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha) > { > - u32 value; > #ifdef PM8001_USE_MSIX > return 1; > -#endif > +#else > + u32 value; > + > value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR); > if (value) > return 1; > return 0; > - > +#endif > } > > /** > -- > 2.20.1 >
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index e4209091c1da..434498a78946 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -4625,15 +4625,16 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, static u32 pm8001_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha) { - u32 value; #ifdef PM8001_USE_MSIX return 1; -#endif +#else + u32 value; + value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR); if (value) return 1; return 0; - +#endif } /** diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index 536d2b4384f8..4a176e60307f 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -4619,15 +4619,16 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, static u32 pm80xx_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha) { - u32 value; #ifdef PM8001_USE_MSIX return 1; -#endif +#else + u32 value; + value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR); if (value) return 1; return 0; - +#endif } /**