| Message ID | 20220211223247.14369-5-bvanassche@acm.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Remove the SCSI pointer from struct scsi_cmnd | expand |
On 2/11/22 23:32, Bart Van Assche wrote: > nsp_reselected() and nsphw_init() always return the same value (TRUE). > Hence change the return type of these functions into 'void'. > > Cc: Hannes Reinecke <hare@suse.com> > Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Cc: John Garry <john.garry@huawei.com> > Cc: Himanshu Madhani <himanshu.madhani@oracle.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > drivers/scsi/pcmcia/nsp_cs.c | 17 +++++------------ > drivers/scsi/pcmcia/nsp_cs.h | 4 ++-- > 2 files changed, 7 insertions(+), 14 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
> On Feb 11, 2022, at 2:32 PM, Bart Van Assche <bvanassche@acm.org> wrote: > > nsp_reselected() and nsphw_init() always return the same value (TRUE). > Hence change the return type of these functions into 'void'. > > Cc: Hannes Reinecke <hare@suse.com> > Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Cc: John Garry <john.garry@huawei.com> > Cc: Himanshu Madhani <himanshu.madhani@oracle.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > drivers/scsi/pcmcia/nsp_cs.c | 17 +++++------------ > drivers/scsi/pcmcia/nsp_cs.h | 4 ++-- > 2 files changed, 7 insertions(+), 14 deletions(-) > > diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c > index 92c818a8a84a..a5c2dd7ebc16 100644 > --- a/drivers/scsi/pcmcia/nsp_cs.c > +++ b/drivers/scsi/pcmcia/nsp_cs.c > @@ -298,7 +298,7 @@ static void nsphw_init_sync(nsp_hw_data *data) > /* > * Initialize Ninja hardware > */ > -static int nsphw_init(nsp_hw_data *data) > +static void nsphw_init(nsp_hw_data *data) > { > unsigned int base = data->BaseAddress; > > @@ -349,8 +349,6 @@ static int nsphw_init(nsp_hw_data *data) > nsp_write(base, IRQCONTROL, IRQCONTROL_ALLCLEAR); > > nsp_setup_fifo(data, FALSE); > - > - return TRUE; > } > > /* > @@ -643,7 +641,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt) > /* > * accept reselection > */ > -static int nsp_reselected(struct scsi_cmnd *SCpnt) > +static void nsp_reselected(struct scsi_cmnd *SCpnt) > { > unsigned int base = SCpnt->device->host->io_port; > unsigned int host_id = SCpnt->device->host->this_id; > @@ -675,8 +673,6 @@ static int nsp_reselected(struct scsi_cmnd *SCpnt) > bus_reg = nsp_index_read(base, SCSIBUSCTRL) & ~(SCSI_BSY | SCSI_ATN); > nsp_index_write(base, SCSIBUSCTRL, bus_reg); > nsp_index_write(base, SCSIBUSCTRL, bus_reg | AUTODIRECTION | ACKENB); > - > - return TRUE; > } > > /* > @@ -1057,9 +1053,8 @@ static irqreturn_t nspintr(int irq, void *dev_id) > if (irq_phase & RESELECT_IRQ) { > nsp_dbg(NSP_DEBUG_INTR, "reselect"); > nsp_write(base, IRQCONTROL, IRQCONTROL_RESELECT_CLEAR); > - if (nsp_reselected(tmpSC) != FALSE) { > - return IRQ_HANDLED; > - } > + nsp_reselected(tmpSC); > + return IRQ_HANDLED; > } > > if ((irq_phase & (PHASE_CHANGE_IRQ | LATCHED_BUS_FREE)) == 0) { > @@ -1614,9 +1609,7 @@ static int nsp_cs_config(struct pcmcia_device *link) > nsp_dbg(NSP_DEBUG_INIT, "I/O[0x%x+0x%x] IRQ %d", > data->BaseAddress, data->NumAddress, data->IrqNumber); > > - if(nsphw_init(data) == FALSE) { > - goto cs_failed; > - } > + nsphw_init(data); > > host = nsp_detect(&nsp_driver_template); > > diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h > index 665bf8d0faf7..94c1f6c7c601 100644 > --- a/drivers/scsi/pcmcia/nsp_cs.h > +++ b/drivers/scsi/pcmcia/nsp_cs.h > @@ -304,7 +304,7 @@ static int nsp_eh_host_reset (struct scsi_cmnd *SCpnt); > static int nsp_bus_reset (nsp_hw_data *data); > > /* */ > -static int nsphw_init (nsp_hw_data *data); > +static void nsphw_init (nsp_hw_data *data); > static int nsphw_start_selection(struct scsi_cmnd *SCpnt); > static void nsp_start_timer (struct scsi_cmnd *SCpnt, int time); > static int nsp_fifo_count (struct scsi_cmnd *SCpnt); > @@ -320,7 +320,7 @@ static int nsp_expect_signal (struct scsi_cmnd *SCpnt, > unsigned char mask); > static int nsp_xfer (struct scsi_cmnd *SCpnt, int phase); > static int nsp_dataphase_bypass (struct scsi_cmnd *SCpnt); > -static int nsp_reselected (struct scsi_cmnd *SCpnt); > +static void nsp_reselected (struct scsi_cmnd *SCpnt); > static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht); > > /* Interrupt handler */ Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> -- Himanshu Madhani Oracle Linux Engineering
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 92c818a8a84a..a5c2dd7ebc16 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c @@ -298,7 +298,7 @@ static void nsphw_init_sync(nsp_hw_data *data) /* * Initialize Ninja hardware */ -static int nsphw_init(nsp_hw_data *data) +static void nsphw_init(nsp_hw_data *data) { unsigned int base = data->BaseAddress; @@ -349,8 +349,6 @@ static int nsphw_init(nsp_hw_data *data) nsp_write(base, IRQCONTROL, IRQCONTROL_ALLCLEAR); nsp_setup_fifo(data, FALSE); - - return TRUE; } /* @@ -643,7 +641,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt) /* * accept reselection */ -static int nsp_reselected(struct scsi_cmnd *SCpnt) +static void nsp_reselected(struct scsi_cmnd *SCpnt) { unsigned int base = SCpnt->device->host->io_port; unsigned int host_id = SCpnt->device->host->this_id; @@ -675,8 +673,6 @@ static int nsp_reselected(struct scsi_cmnd *SCpnt) bus_reg = nsp_index_read(base, SCSIBUSCTRL) & ~(SCSI_BSY | SCSI_ATN); nsp_index_write(base, SCSIBUSCTRL, bus_reg); nsp_index_write(base, SCSIBUSCTRL, bus_reg | AUTODIRECTION | ACKENB); - - return TRUE; } /* @@ -1057,9 +1053,8 @@ static irqreturn_t nspintr(int irq, void *dev_id) if (irq_phase & RESELECT_IRQ) { nsp_dbg(NSP_DEBUG_INTR, "reselect"); nsp_write(base, IRQCONTROL, IRQCONTROL_RESELECT_CLEAR); - if (nsp_reselected(tmpSC) != FALSE) { - return IRQ_HANDLED; - } + nsp_reselected(tmpSC); + return IRQ_HANDLED; } if ((irq_phase & (PHASE_CHANGE_IRQ | LATCHED_BUS_FREE)) == 0) { @@ -1614,9 +1609,7 @@ static int nsp_cs_config(struct pcmcia_device *link) nsp_dbg(NSP_DEBUG_INIT, "I/O[0x%x+0x%x] IRQ %d", data->BaseAddress, data->NumAddress, data->IrqNumber); - if(nsphw_init(data) == FALSE) { - goto cs_failed; - } + nsphw_init(data); host = nsp_detect(&nsp_driver_template); diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h index 665bf8d0faf7..94c1f6c7c601 100644 --- a/drivers/scsi/pcmcia/nsp_cs.h +++ b/drivers/scsi/pcmcia/nsp_cs.h @@ -304,7 +304,7 @@ static int nsp_eh_host_reset (struct scsi_cmnd *SCpnt); static int nsp_bus_reset (nsp_hw_data *data); /* */ -static int nsphw_init (nsp_hw_data *data); +static void nsphw_init (nsp_hw_data *data); static int nsphw_start_selection(struct scsi_cmnd *SCpnt); static void nsp_start_timer (struct scsi_cmnd *SCpnt, int time); static int nsp_fifo_count (struct scsi_cmnd *SCpnt); @@ -320,7 +320,7 @@ static int nsp_expect_signal (struct scsi_cmnd *SCpnt, unsigned char mask); static int nsp_xfer (struct scsi_cmnd *SCpnt, int phase); static int nsp_dataphase_bypass (struct scsi_cmnd *SCpnt); -static int nsp_reselected (struct scsi_cmnd *SCpnt); +static void nsp_reselected (struct scsi_cmnd *SCpnt); static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht); /* Interrupt handler */
nsp_reselected() and nsphw_init() always return the same value (TRUE). Hence change the return type of these functions into 'void'. Cc: Hannes Reinecke <hare@suse.com> Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> Cc: John Garry <john.garry@huawei.com> Cc: Himanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/pcmcia/nsp_cs.c | 17 +++++------------ drivers/scsi/pcmcia/nsp_cs.h | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-)