Commit dfab1e53 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: nsp_cs: Use true and false instead of TRUE and FALSE

This patch prepares for removal of the drivers/scsi/scsi.h header file. That
header file defines the 'TRUE' and 'FALSE' constants.

Link: https://lore.kernel.org/r/20220218195117.25689-6-bvanassche@acm.org
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: John Garry <john.garry@huawei.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 72961735
...@@ -243,7 +243,7 @@ static int nsp_queuecommand_lck(struct scsi_cmnd *SCpnt) ...@@ -243,7 +243,7 @@ static int nsp_queuecommand_lck(struct scsi_cmnd *SCpnt)
SCpnt->SCp.buffers_residual = 0; SCpnt->SCp.buffers_residual = 0;
} }
if (nsphw_start_selection(SCpnt) == FALSE) { if (!nsphw_start_selection(SCpnt)) {
nsp_dbg(NSP_DEBUG_QUEUECOMMAND, "selection fail"); nsp_dbg(NSP_DEBUG_QUEUECOMMAND, "selection fail");
SCpnt->result = DID_BUS_BUSY << 16; SCpnt->result = DID_BUS_BUSY << 16;
nsp_scsi_done(SCpnt); nsp_scsi_done(SCpnt);
...@@ -263,14 +263,14 @@ static DEF_SCSI_QCMD(nsp_queuecommand) ...@@ -263,14 +263,14 @@ static DEF_SCSI_QCMD(nsp_queuecommand)
/* /*
* setup PIO FIFO transfer mode and enable/disable to data out * 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 int base = data->BaseAddress;
unsigned char transfer_mode_reg; unsigned char transfer_mode_reg;
//nsp_dbg(NSP_DEBUG_DATA_IO, "enabled=%d", enabled); //nsp_dbg(NSP_DEBUG_DATA_IO, "enabled=%d", enabled);
if (enabled != FALSE) { if (enabled) {
transfer_mode_reg = TRANSFER_GO | BRAIND; transfer_mode_reg = TRANSFER_GO | BRAIND;
} else { } else {
transfer_mode_reg = 0; transfer_mode_reg = 0;
...@@ -348,13 +348,13 @@ static void nsphw_init(nsp_hw_data *data) ...@@ -348,13 +348,13 @@ static void nsphw_init(nsp_hw_data *data)
SCSI_RESET_IRQ_EI ); SCSI_RESET_IRQ_EI );
nsp_write(base, IRQCONTROL, IRQCONTROL_ALLCLEAR); nsp_write(base, IRQCONTROL, IRQCONTROL_ALLCLEAR);
nsp_setup_fifo(data, FALSE); nsp_setup_fifo(data, false);
} }
/* /*
* Start selection phase * 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 host_id = SCpnt->device->host->this_id;
unsigned int base = SCpnt->device->host->io_port; unsigned int base = SCpnt->device->host->io_port;
...@@ -368,7 +368,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) ...@@ -368,7 +368,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt)
phase = nsp_index_read(base, SCSIBUSMON); phase = nsp_index_read(base, SCSIBUSMON);
if(phase != BUSMON_BUS_FREE) { if(phase != BUSMON_BUS_FREE) {
//nsp_dbg(NSP_DEBUG_RESELECTION, "bus busy"); //nsp_dbg(NSP_DEBUG_RESELECTION, "bus busy");
return FALSE; return false;
} }
/* start arbitration */ /* start arbitration */
...@@ -388,7 +388,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) ...@@ -388,7 +388,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt)
if (!(arbit & ARBIT_WIN)) { if (!(arbit & ARBIT_WIN)) {
//nsp_dbg(NSP_DEBUG_RESELECTION, "arbit fail"); //nsp_dbg(NSP_DEBUG_RESELECTION, "arbit fail");
nsp_index_write(base, SETARBIT, ARBIT_FLAG_CLEAR); nsp_index_write(base, SETARBIT, ARBIT_FLAG_CLEAR);
return FALSE; return false;
} }
/* assert select line */ /* assert select line */
...@@ -407,7 +407,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) ...@@ -407,7 +407,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt)
nsp_start_timer(SCpnt, 1000/51); nsp_start_timer(SCpnt, 1000/51);
data->SelectionTimeOut = 1; data->SelectionTimeOut = 1;
return TRUE; return true;
} }
struct nsp_sync_table { struct nsp_sync_table {
...@@ -477,7 +477,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt) ...@@ -477,7 +477,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt)
sync->SyncRegister = 0; sync->SyncRegister = 0;
sync->AckWidth = 0; sync->AckWidth = 0;
return FALSE; return false;
} }
sync->SyncRegister = (sync_table->chip_period << SYNCREG_PERIOD_SHIFT) | sync->SyncRegister = (sync_table->chip_period << SYNCREG_PERIOD_SHIFT) |
...@@ -486,7 +486,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt) ...@@ -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); 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) ...@@ -633,7 +633,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt)
nsp_dbg(NSP_DEBUG_DATA_IO, "use bypass quirk"); nsp_dbg(NSP_DEBUG_DATA_IO, "use bypass quirk");
SCpnt->SCp.phase = PH_DATA; SCpnt->SCp.phase = PH_DATA;
nsp_pio_read(SCpnt); nsp_pio_read(SCpnt);
nsp_setup_fifo(data, FALSE); nsp_setup_fifo(data, false);
return 0; return 0;
} }
...@@ -927,7 +927,7 @@ static int nsp_nexus(struct scsi_cmnd *SCpnt) ...@@ -927,7 +927,7 @@ static int nsp_nexus(struct scsi_cmnd *SCpnt)
} }
/* setup pdma fifo */ /* setup pdma fifo */
nsp_setup_fifo(data, TRUE); nsp_setup_fifo(data, true);
/* clear ack counter */ /* clear ack counter */
data->FifoCount = 0; data->FifoCount = 0;
...@@ -1210,7 +1210,7 @@ static irqreturn_t nspintr(int irq, void *dev_id) ...@@ -1210,7 +1210,7 @@ static irqreturn_t nspintr(int irq, void *dev_id)
//*sync_neg = SYNC_NOT_YET; //*sync_neg = SYNC_NOT_YET;
data->MsgLen = i = 0; data->MsgLen = i = 0;
data->MsgBuffer[i] = IDENTIFY(TRUE, lun); i++; data->MsgBuffer[i] = IDENTIFY(true, lun); i++;
if (*sync_neg == SYNC_NOT_YET) { if (*sync_neg == SYNC_NOT_YET) {
data->Sync[target].SyncPeriod = 0; data->Sync[target].SyncPeriod = 0;
......
...@@ -305,7 +305,7 @@ static int nsp_bus_reset (nsp_hw_data *data); ...@@ -305,7 +305,7 @@ static int nsp_bus_reset (nsp_hw_data *data);
/* */ /* */
static void nsphw_init (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 void nsp_start_timer (struct scsi_cmnd *SCpnt, int time);
static int nsp_fifo_count (struct scsi_cmnd *SCpnt); static int nsp_fifo_count (struct scsi_cmnd *SCpnt);
static void nsp_pio_read (struct scsi_cmnd *SCpnt); static void nsp_pio_read (struct scsi_cmnd *SCpnt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment