| Message ID | 20220211223247.14369-6-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: > This patch prepares for removal of the drivers/scsi/scsi.h header file. That > header file defines the 'TRUE' and 'FALSE' constants. > > 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 | 26 +++++++++++++------------- > drivers/scsi/pcmcia/nsp_cs.h | 2 +- > 2 files changed, 14 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: > > This patch prepares for removal of the drivers/scsi/scsi.h header file. That > header file defines the 'TRUE' and 'FALSE' constants. > > 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 | 26 +++++++++++++------------- > drivers/scsi/pcmcia/nsp_cs.h | 2 +- > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c > index a5c2dd7ebc16..a78a86511e94 100644 > --- a/drivers/scsi/pcmcia/nsp_cs.c > +++ b/drivers/scsi/pcmcia/nsp_cs.c > @@ -243,7 +243,7 @@ static int nsp_queuecommand_lck(struct scsi_cmnd *SCpnt) > SCpnt->SCp.buffers_residual = 0; > } > > - if (nsphw_start_selection(SCpnt) == FALSE) { > + if (!nsphw_start_selection(SCpnt)) { > nsp_dbg(NSP_DEBUG_QUEUECOMMAND, "selection fail"); > SCpnt->result = DID_BUS_BUSY << 16; > nsp_scsi_done(SCpnt); > @@ -263,14 +263,14 @@ static DEF_SCSI_QCMD(nsp_queuecommand) > /* > * setup PIO FIFO transfer mode and enable/disable to data out > */ > -static void nsp_setup_fifo(nsp_hw_data *data, int enabled) > +static void nsp_setup_fifo(nsp_hw_data *data, bool enabled) > { > unsigned int base = data->BaseAddress; > unsigned char transfer_mode_reg; > > //nsp_dbg(NSP_DEBUG_DATA_IO, "enabled=%d", enabled); > > - if (enabled != FALSE) { > + if (enabled) { > transfer_mode_reg = TRANSFER_GO | BRAIND; > } else { > transfer_mode_reg = 0; > @@ -348,13 +348,13 @@ static void nsphw_init(nsp_hw_data *data) > SCSI_RESET_IRQ_EI ); > nsp_write(base, IRQCONTROL, IRQCONTROL_ALLCLEAR); > > - nsp_setup_fifo(data, FALSE); > + nsp_setup_fifo(data, false); > } > > /* > * Start selection phase > */ > -static int nsphw_start_selection(struct scsi_cmnd *SCpnt) > +static bool nsphw_start_selection(struct scsi_cmnd *SCpnt) > { > unsigned int host_id = SCpnt->device->host->this_id; > unsigned int base = SCpnt->device->host->io_port; > @@ -368,7 +368,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) > phase = nsp_index_read(base, SCSIBUSMON); > if(phase != BUSMON_BUS_FREE) { > //nsp_dbg(NSP_DEBUG_RESELECTION, "bus busy"); > - return FALSE; > + return false; > } > > /* start arbitration */ > @@ -388,7 +388,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) > if (!(arbit & ARBIT_WIN)) { > //nsp_dbg(NSP_DEBUG_RESELECTION, "arbit fail"); > nsp_index_write(base, SETARBIT, ARBIT_FLAG_CLEAR); > - return FALSE; > + return false; > } > > /* assert select line */ > @@ -407,7 +407,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) > nsp_start_timer(SCpnt, 1000/51); > data->SelectionTimeOut = 1; > > - return TRUE; > + return true; > } > > struct nsp_sync_table { > @@ -477,7 +477,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt) > sync->SyncRegister = 0; > sync->AckWidth = 0; > > - return FALSE; > + return false; > } > > sync->SyncRegister = (sync_table->chip_period << SYNCREG_PERIOD_SHIFT) | > @@ -486,7 +486,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt) > > nsp_dbg(NSP_DEBUG_SYNC, "sync_reg=0x%x, ack_width=0x%x", sync->SyncRegister, sync->AckWidth); > > - return TRUE; > + return true; > } > > > @@ -633,7 +633,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt) > nsp_dbg(NSP_DEBUG_DATA_IO, "use bypass quirk"); > SCpnt->SCp.phase = PH_DATA; > nsp_pio_read(SCpnt); > - nsp_setup_fifo(data, FALSE); > + nsp_setup_fifo(data, false); > > return 0; > } > @@ -927,7 +927,7 @@ static int nsp_nexus(struct scsi_cmnd *SCpnt) > } > > /* setup pdma fifo */ > - nsp_setup_fifo(data, TRUE); > + nsp_setup_fifo(data, true); > > /* clear ack counter */ > data->FifoCount = 0; > @@ -1210,7 +1210,7 @@ static irqreturn_t nspintr(int irq, void *dev_id) > //*sync_neg = SYNC_NOT_YET; > > data->MsgLen = i = 0; > - data->MsgBuffer[i] = IDENTIFY(TRUE, lun); i++; > + data->MsgBuffer[i] = IDENTIFY(true, lun); i++; > > if (*sync_neg == SYNC_NOT_YET) { > data->Sync[target].SyncPeriod = 0; > diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h > index 94c1f6c7c601..7d5d1a5b36e0 100644 > --- a/drivers/scsi/pcmcia/nsp_cs.h > +++ b/drivers/scsi/pcmcia/nsp_cs.h > @@ -305,7 +305,7 @@ static int nsp_bus_reset (nsp_hw_data *data); > > /* */ > static void nsphw_init (nsp_hw_data *data); > -static int nsphw_start_selection(struct scsi_cmnd *SCpnt); > +static bool 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); > static void nsp_pio_read (struct scsi_cmnd *SCpnt); 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 a5c2dd7ebc16..a78a86511e94 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c @@ -243,7 +243,7 @@ static int nsp_queuecommand_lck(struct scsi_cmnd *SCpnt) SCpnt->SCp.buffers_residual = 0; } - if (nsphw_start_selection(SCpnt) == FALSE) { + if (!nsphw_start_selection(SCpnt)) { nsp_dbg(NSP_DEBUG_QUEUECOMMAND, "selection fail"); SCpnt->result = DID_BUS_BUSY << 16; nsp_scsi_done(SCpnt); @@ -263,14 +263,14 @@ static DEF_SCSI_QCMD(nsp_queuecommand) /* * setup PIO FIFO transfer mode and enable/disable to data out */ -static void nsp_setup_fifo(nsp_hw_data *data, int enabled) +static void nsp_setup_fifo(nsp_hw_data *data, bool enabled) { unsigned int base = data->BaseAddress; unsigned char transfer_mode_reg; //nsp_dbg(NSP_DEBUG_DATA_IO, "enabled=%d", enabled); - if (enabled != FALSE) { + if (enabled) { transfer_mode_reg = TRANSFER_GO | BRAIND; } else { transfer_mode_reg = 0; @@ -348,13 +348,13 @@ static void nsphw_init(nsp_hw_data *data) SCSI_RESET_IRQ_EI ); nsp_write(base, IRQCONTROL, IRQCONTROL_ALLCLEAR); - nsp_setup_fifo(data, FALSE); + nsp_setup_fifo(data, false); } /* * Start selection phase */ -static int nsphw_start_selection(struct scsi_cmnd *SCpnt) +static bool nsphw_start_selection(struct scsi_cmnd *SCpnt) { unsigned int host_id = SCpnt->device->host->this_id; unsigned int base = SCpnt->device->host->io_port; @@ -368,7 +368,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) phase = nsp_index_read(base, SCSIBUSMON); if(phase != BUSMON_BUS_FREE) { //nsp_dbg(NSP_DEBUG_RESELECTION, "bus busy"); - return FALSE; + return false; } /* start arbitration */ @@ -388,7 +388,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) if (!(arbit & ARBIT_WIN)) { //nsp_dbg(NSP_DEBUG_RESELECTION, "arbit fail"); nsp_index_write(base, SETARBIT, ARBIT_FLAG_CLEAR); - return FALSE; + return false; } /* assert select line */ @@ -407,7 +407,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) nsp_start_timer(SCpnt, 1000/51); data->SelectionTimeOut = 1; - return TRUE; + return true; } struct nsp_sync_table { @@ -477,7 +477,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt) sync->SyncRegister = 0; sync->AckWidth = 0; - return FALSE; + return false; } sync->SyncRegister = (sync_table->chip_period << SYNCREG_PERIOD_SHIFT) | @@ -486,7 +486,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt) nsp_dbg(NSP_DEBUG_SYNC, "sync_reg=0x%x, ack_width=0x%x", sync->SyncRegister, sync->AckWidth); - return TRUE; + return true; } @@ -633,7 +633,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt) nsp_dbg(NSP_DEBUG_DATA_IO, "use bypass quirk"); SCpnt->SCp.phase = PH_DATA; nsp_pio_read(SCpnt); - nsp_setup_fifo(data, FALSE); + nsp_setup_fifo(data, false); return 0; } @@ -927,7 +927,7 @@ static int nsp_nexus(struct scsi_cmnd *SCpnt) } /* setup pdma fifo */ - nsp_setup_fifo(data, TRUE); + nsp_setup_fifo(data, true); /* clear ack counter */ data->FifoCount = 0; @@ -1210,7 +1210,7 @@ static irqreturn_t nspintr(int irq, void *dev_id) //*sync_neg = SYNC_NOT_YET; data->MsgLen = i = 0; - data->MsgBuffer[i] = IDENTIFY(TRUE, lun); i++; + data->MsgBuffer[i] = IDENTIFY(true, lun); i++; if (*sync_neg == SYNC_NOT_YET) { data->Sync[target].SyncPeriod = 0; diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h index 94c1f6c7c601..7d5d1a5b36e0 100644 --- a/drivers/scsi/pcmcia/nsp_cs.h +++ b/drivers/scsi/pcmcia/nsp_cs.h @@ -305,7 +305,7 @@ static int nsp_bus_reset (nsp_hw_data *data); /* */ static void nsphw_init (nsp_hw_data *data); -static int nsphw_start_selection(struct scsi_cmnd *SCpnt); +static bool 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); static void nsp_pio_read (struct scsi_cmnd *SCpnt);
This patch prepares for removal of the drivers/scsi/scsi.h header file. That header file defines the 'TRUE' and 'FALSE' constants. 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 | 26 +++++++++++++------------- drivers/scsi/pcmcia/nsp_cs.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-)