Re: [PATCH] scsi: pm8001: clean up structurally dead code when PM8001_USE_MSIX is defined (part2)

[Mukesh Ojha]

On 3/30/2019 1:38 AM, Mukesh Ojha wrote:
> On 3/29/2019 9:02 PM, Colin King wrote:
> > From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> >
> > 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.
> >
> > Also rename the functions pm8001_chip_is_our_interupt,
> > pm80xx_chip_is_our_interupt and function pointer is_our_interrupt
> > to fix spelling mistakes.
> >
> > Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
>
> It would be better if you could split this into two patch, one for 
> dead code and other for renaming.

Also, What is that part2 in the subject ? please remove that too.


> Otherwise change looks good.
>
> Once you fix above you could include .
> Reviewed-by: Mukesh Ojha <mojha@xxxxxxxxxxxxxx>
>
> Cheers,
> -Mukesh
>
>
> > ---
> >  drivers/scsi/pm8001/pm8001_hwi.c | 11 ++++++-----
> > Â drivers/scsi/pm8001/pm8001_init.c |Â 4 ++--
> >  drivers/scsi/pm8001/pm8001_sas.h | 2 +-
> >  drivers/scsi/pm8001/pm80xx_hwi.c | 11 ++++++-----
> > Â 4 files changed, 15 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/scsi/pm8001/pm8001_hwi.c 
> > b/drivers/scsi/pm8001/pm8001_hwi.c
> > index e4209091c1da..627075d00918 100644
> > --- a/drivers/scsi/pm8001/pm8001_hwi.c
> > +++ b/drivers/scsi/pm8001/pm8001_hwi.c
> > @@ -4623,17 +4623,18 @@ static int pm8001_chip_phy_ctl_req(struct 
> > pm8001_hba_info *pm8001_ha,
> > ÂÂÂÂÂ return ret;
> > Â }
> > Â -static u32 pm8001_chip_is_our_interupt(struct pm8001_hba_info 
> > *pm8001_ha)
> > +static u32 pm8001_chip_is_our_interrupt(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
> > Â }
> > Â Â /**
> > @@ -5119,7 +5120,7 @@ const struct pm8001_dispatch 
> > pm8001_8001_dispatch = {
> > ÂÂÂÂÂ .chip_rstÂÂÂÂÂÂÂ = pm8001_hw_chip_rst,
> > ÂÂÂÂÂ .chip_iounmapÂÂÂÂÂÂÂ = pm8001_chip_iounmap,
> > ÂÂÂÂÂ .isrÂÂÂÂÂÂÂÂÂÂÂ = pm8001_chip_isr,
> > -ÂÂÂ .is_our_interuptÂÂÂ = pm8001_chip_is_our_interupt,
> > +ÂÂÂ .is_our_interruptÂÂÂ = pm8001_chip_is_our_interrupt,
> > ÂÂÂÂÂ .isr_process_oqÂÂÂÂÂÂÂ = process_oq,
> > ÂÂÂÂÂ .interrupt_enableÂÂÂÂ = pm8001_chip_interrupt_enable,
> > ÂÂÂÂÂ .interrupt_disableÂÂÂ = pm8001_chip_interrupt_disable,
> > diff --git a/drivers/scsi/pm8001/pm8001_init.c 
> > b/drivers/scsi/pm8001/pm8001_init.c
> > index a36060c23b37..3374f553c617 100644
> > --- a/drivers/scsi/pm8001/pm8001_init.c
> > +++ b/drivers/scsi/pm8001/pm8001_init.c
> > @@ -201,7 +201,7 @@ static irqreturn_t 
> > pm8001_interrupt_handler_msix(int irq, void *opaque)
> > Â ÂÂÂÂÂ if (unlikely(!pm8001_ha))
> > ÂÂÂÂÂÂÂÂÂ return IRQ_NONE;
> > -ÂÂÂ if (!PM8001_CHIP_DISP->is_our_interupt(pm8001_ha))
> > +ÂÂÂ if (!PM8001_CHIP_DISP->is_our_interrupt(pm8001_ha))
> > ÂÂÂÂÂÂÂÂÂ return IRQ_NONE;
> > Â #ifdef PM8001_USE_TASKLET
> > tasklet_schedule(&pm8001_ha->tasklet[irq_vector->irq_id]);
> > @@ -224,7 +224,7 @@ static irqreturn_t 
> > pm8001_interrupt_handler_intx(int irq, void *dev_id)
> > ÂÂÂÂÂ pm8001_ha = sha->lldd_ha;
> > ÂÂÂÂÂ if (unlikely(!pm8001_ha))
> > ÂÂÂÂÂÂÂÂÂ return IRQ_NONE;
> > -ÂÂÂ if (!PM8001_CHIP_DISP->is_our_interupt(pm8001_ha))
> > +ÂÂÂ if (!PM8001_CHIP_DISP->is_our_interrupt(pm8001_ha))
> > ÂÂÂÂÂÂÂÂÂ return IRQ_NONE;
> > Â Â #ifdef PM8001_USE_TASKLET
> > diff --git a/drivers/scsi/pm8001/pm8001_sas.h 
> > b/drivers/scsi/pm8001/pm8001_sas.h
> > index f88b0d33c385..ac6d8e3f22de 100644
> > --- a/drivers/scsi/pm8001/pm8001_sas.h
> > +++ b/drivers/scsi/pm8001/pm8001_sas.h
> > @@ -197,7 +197,7 @@ struct pm8001_dispatch {
> > ÂÂÂÂÂ int (*chip_ioremap)(struct pm8001_hba_info *pm8001_ha);
> > ÂÂÂÂÂ void (*chip_iounmap)(struct pm8001_hba_info *pm8001_ha);
> > ÂÂÂÂÂ irqreturn_t (*isr)(struct pm8001_hba_info *pm8001_ha, u8 vec);
> > -ÂÂÂ u32 (*is_our_interupt)(struct pm8001_hba_info *pm8001_ha);
> > +ÂÂÂ u32 (*is_our_interrupt)(struct pm8001_hba_info *pm8001_ha);
> > ÂÂÂÂÂ int (*isr_process_oq)(struct pm8001_hba_info *pm8001_ha, u8 vec);
> > ÂÂÂÂÂ void (*interrupt_enable)(struct pm8001_hba_info *pm8001_ha, u8 
> > vec);
> > ÂÂÂÂÂ void (*interrupt_disable)(struct pm8001_hba_info *pm8001_ha, u8 
> > vec);
> > diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c 
> > b/drivers/scsi/pm8001/pm80xx_hwi.c
> > index 536d2b4384f8..301de40eb708 100644
> > --- a/drivers/scsi/pm8001/pm80xx_hwi.c
> > +++ b/drivers/scsi/pm8001/pm80xx_hwi.c
> > @@ -4617,17 +4617,18 @@ static int pm80xx_chip_phy_ctl_req(struct 
> > pm8001_hba_info *pm8001_ha,
> > ÂÂÂÂÂ return pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, 
> > &payload, 0);
> > Â }
> > Â -static u32 pm80xx_chip_is_our_interupt(struct pm8001_hba_info 
> > *pm8001_ha)
> > +static u32 pm80xx_chip_is_our_interrupt(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
> > Â }
> > Â Â /**
> > @@ -4724,7 +4725,7 @@ const struct pm8001_dispatch 
> > pm8001_80xx_dispatch = {
> > ÂÂÂÂÂ .chip_rstÂÂÂÂÂÂÂ = pm80xx_hw_chip_rst,
> > ÂÂÂÂÂ .chip_iounmapÂÂÂÂÂÂÂ = pm8001_chip_iounmap,
> > ÂÂÂÂÂ .isrÂÂÂÂÂÂÂÂÂÂÂ = pm80xx_chip_isr,
> > -ÂÂÂ .is_our_interuptÂÂÂ = pm80xx_chip_is_our_interupt,
> > +ÂÂÂ .is_our_interruptÂÂÂ = pm80xx_chip_is_our_interrupt,
> > ÂÂÂÂÂ .isr_process_oqÂÂÂÂÂÂÂ = process_oq,
> > ÂÂÂÂÂ .interrupt_enableÂÂÂ = pm80xx_chip_interrupt_enable,
> > ÂÂÂÂÂ .interrupt_disableÂÂÂ = pm80xx_chip_interrupt_disable,