scsi: ips: 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-4-bvanassche@acm.org
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 59664e9..d22ba53 100644 (file)
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -945,7 +945,7 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
                        scsi_done(scsi_cmd);
                }
 
-               ha->active = FALSE;
+               ha->active = false;
                return (FAILED);
        }
 
@@ -974,7 +974,7 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
                        scsi_done(scsi_cmd);
                }
 
-               ha->active = FALSE;
+               ha->active = false;
                return (FAILED);
        }
 
@@ -1287,7 +1287,7 @@ ips_intr_copperhead(ips_ha_t * ha)
                return 0;
        }
 
-       while (TRUE) {
+       while (true) {
                sp = &ha->sp;
 
                intrstatus = (*ha->func.isintr) (ha);
@@ -1351,7 +1351,7 @@ ips_intr_morpheus(ips_ha_t * ha)
                return 0;
        }
 
-       while (TRUE) {
+       while (true) {
                sp = &ha->sp;
 
                intrstatus = (*ha->func.isintr) (ha);
@@ -3086,8 +3086,8 @@ ipsintr_blocking(ips_ha_t * ha, ips_scb_t * scb)
        METHOD_TRACE("ipsintr_blocking", 2);
 
        ips_freescb(ha, scb);
-       if ((ha->waitflag == TRUE) && (ha->cmd_in_progress == scb->cdb[0])) {
-               ha->waitflag = FALSE;
+       if (ha->waitflag && ha->cmd_in_progress == scb->cdb[0]) {
+               ha->waitflag = false;
 
                return;
        }
@@ -3387,7 +3387,7 @@ ips_send_wait(ips_ha_t * ha, ips_scb_t * scb, int timeout, int intr)
        METHOD_TRACE("ips_send_wait", 1);
 
        if (intr != IPS_FFDC) { /* Won't be Waiting if this is a Time Stamp */
-               ha->waitflag = TRUE;
+               ha->waitflag = true;
                ha->cmd_in_progress = scb->cdb[0];
        }
        scb->callback = ipsintr_blocking;
@@ -3464,10 +3464,8 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)
                if (scb->bus > 0) {
                        /* Controller commands can't be issued */
                        /* to real devices -- fail them        */
-                       if ((ha->waitflag == TRUE) &&
-                           (ha->cmd_in_progress == scb->cdb[0])) {
-                               ha->waitflag = FALSE;
-                       }
+                       if (ha->waitflag && ha->cmd_in_progress == scb->cdb[0])
+                               ha->waitflag = false;
 
                        return (1);
                }
@@ -4615,7 +4613,7 @@ ips_poll_for_flush_complete(ips_ha_t * ha)
 {
        IPS_STATUS cstatus;
 
-       while (TRUE) {
+       while (true) {
            cstatus.value = (*ha->func.statupd) (ha);
 
            if (cstatus.value == 0xffffffff)      /* If No Interrupt to process */
@@ -5538,26 +5536,26 @@ ips_wait(ips_ha_t * ha, int time, int intr)
        METHOD_TRACE("ips_wait", 1);
 
        ret = IPS_FAILURE;
-       done = FALSE;
+       done = false;
 
        time *= IPS_ONE_SEC;    /* convert seconds */
 
        while ((time > 0) && (!done)) {
                if (intr == IPS_INTR_ON) {
-                       if (ha->waitflag == FALSE) {
+                       if (!ha->waitflag) {
                                ret = IPS_SUCCESS;
-                               done = TRUE;
+                               done = true;
                                break;
                        }
                } else if (intr == IPS_INTR_IORL) {
-                       if (ha->waitflag == FALSE) {
+                       if (!ha->waitflag) {
                                /*
                                 * controller generated an interrupt to
                                 * acknowledge completion of the command
                                 * and ips_intr() has serviced the interrupt.
                                 */
                                ret = IPS_SUCCESS;
-                               done = TRUE;
+                               done = true;
                                break;
                        }
 
@@ -5592,7 +5590,7 @@ ips_write_driver_status(ips_ha_t * ha, int intr)
 {
        METHOD_TRACE("ips_write_driver_status", 1);
 
-       if (!ips_readwrite_page5(ha, FALSE, intr)) {
+       if (!ips_readwrite_page5(ha, false, intr)) {
                IPS_PRINTK(KERN_WARNING, ha->pcidev,
                           "unable to read NVRAM page 5.\n");
 
@@ -5630,7 +5628,7 @@ ips_write_driver_status(ips_ha_t * ha, int intr)
        ha->nvram->versioning = 0;      /* Indicate the Driver Does Not Support Versioning */
 
        /* now update the page */
-       if (!ips_readwrite_page5(ha, TRUE, intr)) {
+       if (!ips_readwrite_page5(ha, true, intr)) {
                IPS_PRINTK(KERN_WARNING, ha->pcidev,
                           "unable to write NVRAM page 5.\n");