Re: [PATCH v2 02/44] nsp_cs: Use true and false instead of TRUE and FALSE

[Himanshu Madhani <himanshu.madhani@oracle.com>]

> On Feb 8, 2022, at 9:24 AM, Bart Van Assche <bvanassche@acm.org> wrote:
> 
> Additionally, change the return type of the functions that always return
> TRUE from 'int' into 'void'. This patch prepares for removal of the
> drivers/scsi/scsi.h header file. That header file defines the 'TRUE' and
> 'FALSE' constants.
> 
> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/pcmcia/nsp_cs.c | 43 +++++++++++++++---------------------
> drivers/scsi/pcmcia/nsp_cs.h |  6 ++---
> 2 files changed, 21 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
> index 92c818a8a84a..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;
> @@ -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;
> 
> @@ -348,15 +348,13 @@ static int nsphw_init(nsp_hw_data *data)
> 					    SCSI_RESET_IRQ_EI	 );
> 	nsp_write(base,	      IRQCONTROL,   IRQCONTROL_ALLCLEAR);
> 
> -	nsp_setup_fifo(data, FALSE);
> -
> -	return TRUE;
> +	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;
> @@ -370,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 */
> @@ -390,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 */
> @@ -409,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 {
> @@ -479,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) |
> @@ -488,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;
> }
> 
> 
> @@ -635,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;
> }
> @@ -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;
> }
> 
> /*
> @@ -931,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;
> @@ -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) {
> @@ -1215,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;
> @@ -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..7d5d1a5b36e0 100644
> --- a/drivers/scsi/pcmcia/nsp_cs.h
> +++ b/drivers/scsi/pcmcia/nsp_cs.h
> @@ -304,8 +304,8 @@ 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 int  nsphw_start_selection(struct scsi_cmnd *SCpnt);
> +static void nsphw_init           (nsp_hw_data *data);
> +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);
> @@ -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