[SCSI] qla2xxx: Ensure the timer and DPC routines complete prior to midlayer tear...
[safe/jmp/linux-2.6] / drivers / scsi / FlashPoint.c
index ce49fbc..b898d38 100644 (file)
@@ -15,9 +15,8 @@
 
 */
 
-#include <linux/config.h>
 
-#ifndef CONFIG_SCSI_OMIT_FLASHPOINT
+#ifdef CONFIG_SCSI_FLASHPOINT
 
 #define MAX_CARDS      8
 #undef BUSTYPE_PCI
@@ -26,9 +25,6 @@
 
 #define FAILURE         0xFFFFFFFFL
 
-#define BIT(x)          ((unsigned char)(1<<(x)))      /* single-bit mask in bit position x */
-#define BITW(x)          ((unsigned short)(1<<(x)))    /* single-bit mask in bit position x */
-
 struct sccb;
 typedef void (*CALL_BK_FN) (struct sccb *);
 
@@ -375,9 +371,9 @@ typedef struct SCCBscam_info {
 #define  SCAM_ENABLED   BIT(2)
 #define  SCAM_LEVEL2    BIT(3)
 
-#define        RENEGO_ENA              BITW(10)
-#define        CONNIO_ENA              BITW(11)
-#define  GREEN_PC_ENA   BITW(12)
+#define        RENEGO_ENA              BIT(10)
+#define        CONNIO_ENA              BIT(11)
+#define  GREEN_PC_ENA   BIT(12)
 
 #define  AUTO_RATE_00   00
 #define  AUTO_RATE_05   01
@@ -512,23 +508,23 @@ typedef struct SCCBscam_info {
 
 #define  hp_intena              0x40
 
-#define  RESET          BITW(7)
-#define  PROG_HLT               BITW(6)
-#define  PARITY                 BITW(5)
-#define  FIFO           BITW(4)
-#define  SEL            BITW(3)
-#define  SCAM_SEL               BITW(2)
-#define  RSEL           BITW(1)
-#define  TIMEOUT                BITW(0)
-#define  BUS_FREE               BITW(15)
-#define  XFER_CNT_0     BITW(14)
-#define  PHASE          BITW(13)
-#define  IUNKWN                 BITW(12)
-#define  ICMD_COMP      BITW(11)
-#define  ITICKLE                BITW(10)
-#define  IDO_STRT               BITW(9)
-#define  ITAR_DISC      BITW(8)
-#define  AUTO_INT               (BITW(12)+BITW(11)+BITW(10)+BITW(9)+BITW(8))
+#define  RESET          BIT(7)
+#define  PROG_HLT               BIT(6)
+#define  PARITY                 BIT(5)
+#define  FIFO           BIT(4)
+#define  SEL            BIT(3)
+#define  SCAM_SEL               BIT(2)
+#define  RSEL           BIT(1)
+#define  TIMEOUT                BIT(0)
+#define  BUS_FREE               BIT(15)
+#define  XFER_CNT_0     BIT(14)
+#define  PHASE          BIT(13)
+#define  IUNKWN                 BIT(12)
+#define  ICMD_COMP      BIT(11)
+#define  ITICKLE                BIT(10)
+#define  IDO_STRT               BIT(9)
+#define  ITAR_DISC      BIT(8)
+#define  AUTO_INT               (BIT(12)+BIT(11)+BIT(10)+BIT(9)+BIT(8))
 #define  CLR_ALL_INT    0xFFFF
 #define  CLR_ALL_INT_1  0xFF00
 
@@ -675,37 +671,37 @@ typedef struct SCCBscam_info {
 #define  BIOS_DATA_OFFSET     0x60
 #define  BIOS_RELATIVE_CARD   0x64
 
-#define  AR3      (BITW(9) + BITW(8))
-#define  SDATA    BITW(10)
+#define  AR3      (BIT(9) + BIT(8))
+#define  SDATA    BIT(10)
 
-#define  CRD_OP   BITW(11)     /* Cmp Reg. w/ Data */
+#define  CRD_OP   BIT(11)      /* Cmp Reg. w/ Data */
 
-#define  CRR_OP   BITW(12)     /* Cmp Reg. w. Reg. */
+#define  CRR_OP   BIT(12)      /* Cmp Reg. w. Reg. */
 
-#define  CPE_OP   (BITW(14)+BITW(11))  /* Cmp SCSI phs & Branch EQ */
+#define  CPE_OP   (BIT(14)+BIT(11))    /* Cmp SCSI phs & Branch EQ */
 
-#define  CPN_OP   (BITW(14)+BITW(12))  /* Cmp SCSI phs & Branch NOT EQ */
+#define  CPN_OP   (BIT(14)+BIT(12))    /* Cmp SCSI phs & Branch NOT EQ */
 
 #define  ADATA_OUT   0x00
-#define  ADATA_IN    BITW(8)
-#define  ACOMMAND    BITW(10)
-#define  ASTATUS     (BITW(10)+BITW(8))
-#define  AMSG_OUT    (BITW(10)+BITW(9))
-#define  AMSG_IN     (BITW(10)+BITW(9)+BITW(8))
+#define  ADATA_IN    BIT(8)
+#define  ACOMMAND    BIT(10)
+#define  ASTATUS     (BIT(10)+BIT(8))
+#define  AMSG_OUT    (BIT(10)+BIT(9))
+#define  AMSG_IN     (BIT(10)+BIT(9)+BIT(8))
 
-#define  BRH_OP   BITW(13)     /* Branch */
+#define  BRH_OP   BIT(13)      /* Branch */
 
 #define  ALWAYS   0x00
-#define  EQUAL    BITW(8)
-#define  NOT_EQ   BITW(9)
+#define  EQUAL    BIT(8)
+#define  NOT_EQ   BIT(9)
 
-#define  TCB_OP   (BITW(13)+BITW(11))  /* Test condition & branch */
+#define  TCB_OP   (BIT(13)+BIT(11))    /* Test condition & branch */
 
-#define  FIFO_0      BITW(10)
+#define  FIFO_0      BIT(10)
 
-#define  MPM_OP   BITW(15)     /* Match phase and move data */
+#define  MPM_OP   BIT(15)      /* Match phase and move data */
 
-#define  MRR_OP   BITW(14)     /* Move DReg. to Reg. */
+#define  MRR_OP   BIT(14)      /* Move DReg. to Reg. */
 
 #define  S_IDREG  (BIT(2)+BIT(1)+BIT(0))
 
@@ -713,9 +709,9 @@ typedef struct SCCBscam_info {
 #define  D_AR1    BIT(0)
 #define  D_BUCKET (BIT(2) + BIT(1) + BIT(0))
 
-#define  RAT_OP      (BITW(14)+BITW(13)+BITW(11))
+#define  RAT_OP      (BIT(14)+BIT(13)+BIT(11))
 
-#define  SSI_OP      (BITW(15)+BITW(11))
+#define  SSI_OP      (BIT(15)+BIT(11))
 
 #define  SSI_ITAR_DISC (ITAR_DISC >> 8)
 #define  SSI_IDO_STRT  (IDO_STRT >> 8)
@@ -945,16 +941,16 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo)
        ioport = pCardInfo->si_baseaddr;
 
        if (RD_HARPOON(ioport + hp_vendor_id_0) != ORION_VEND_0)
-               return ((int)FAILURE);
+               return (int)FAILURE;
 
        if ((RD_HARPOON(ioport + hp_vendor_id_1) != ORION_VEND_1))
-               return ((int)FAILURE);
+               return (int)FAILURE;
 
        if ((RD_HARPOON(ioport + hp_device_id_0) != ORION_DEV_0))
-               return ((int)FAILURE);
+               return (int)FAILURE;
 
        if ((RD_HARPOON(ioport + hp_device_id_1) != ORION_DEV_1))
-               return ((int)FAILURE);
+               return (int)FAILURE;
 
        if (RD_HARPOON(ioport + hp_rev_num) != 0x0f) {
 
@@ -964,7 +960,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo)
        device. */
 
                if (RD_HARPOON(ioport + hp_sub_device_id_0) & 0x0f)
-                       return ((int)FAILURE);
+                       return (int)FAILURE;
        }
 
        if (first_time) {
@@ -986,7 +982,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo)
                                pCurrNvRam->niBaseAddr = ioport;
                                FPT_RNVRamData(pCurrNvRam);
                        } else
-                               return ((int)FAILURE);
+                               return (int)FAILURE;
                }
        } else
                pCurrNvRam = NULL;
@@ -1194,7 +1190,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo)
 
        pCardInfo->si_present = 0x01;
 
-       return (0);
+       return 0;
 }
 
 /*---------------------------------------------------------------------
@@ -1220,7 +1216,7 @@ static unsigned long FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info
 
                if (thisCard == MAX_CARDS) {
 
-                       return (FAILURE);
+                       return FAILURE;
                }
 
                if (FPT_BL_Card[thisCard].ioPort == ioport) {
@@ -1388,7 +1384,7 @@ static unsigned long FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info
                   (unsigned char)(RD_HARPOON((ioport + hp_semaphore)) |
                                   SCCB_MGR_PRESENT));
 
-       return ((unsigned long)CurrCard);
+       return (unsigned long)CurrCard;
 }
 
 static void FlashPoint_ReleaseHostAdapter(unsigned long pCurrCard)
@@ -1460,7 +1456,7 @@ static void FPT_RNVRamData(struct nvram_info *pNvRamInfo)
 static unsigned char FPT_RdStack(unsigned long portBase, unsigned char index)
 {
        WR_HARPOON(portBase + hp_stack_addr, index);
-       return (RD_HARPOON(portBase + hp_stack_data));
+       return RD_HARPOON(portBase + hp_stack_data);
 }
 
 static void FPT_WrStack(unsigned long portBase, unsigned char index,
@@ -1473,14 +1469,14 @@ static void FPT_WrStack(unsigned long portBase, unsigned char index,
 static unsigned char FPT_ChkIfChipInitialized(unsigned long ioPort)
 {
        if ((RD_HARPOON(ioPort + hp_arb_id) & 0x0f) != FPT_RdStack(ioPort, 4))
-               return (0);
+               return 0;
        if ((RD_HARPOON(ioPort + hp_clkctrl_0) & CLKCTRL_DEFAULT)
            != CLKCTRL_DEFAULT)
-               return (0);
+               return 0;
        if ((RD_HARPOON(ioPort + hp_seltimeout) == TO_250ms) ||
            (RD_HARPOON(ioPort + hp_seltimeout) == TO_290ms))
-               return (1);
-       return (0);
+               return 1;
+       return 0;
 
 }
 
@@ -1503,7 +1499,7 @@ static void FlashPoint_StartCCB(unsigned long pCurrCard, struct sccb *p_Sccb)
        thisCard = ((struct sccb_card *)pCurrCard)->cardIndex;
        ioport = ((struct sccb_card *)pCurrCard)->ioPort;
 
-       if ((p_Sccb->TargID > MAX_SCSI_TAR) || (p_Sccb->Lun > MAX_LUN)) {
+       if ((p_Sccb->TargID >= MAX_SCSI_TAR) || (p_Sccb->Lun >= MAX_LUN)) {
 
                p_Sccb->HostStatus = SCCB_COMPLETE;
                p_Sccb->SccbStatus = SCCB_ERROR;
@@ -1642,14 +1638,14 @@ static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb *p_Sccb)
                        callback = p_Sccb->SccbCallback;
                        callback(p_Sccb);
 
-                       return (0);
+                       return 0;
                }
 
                else {
                        if (((struct sccb_card *)pCurrCard)->currentSCCB ==
                            p_Sccb) {
                                p_Sccb->SccbStatus = SCCB_ABORT;
-                               return (0);
+                               return 0;
 
                        }
 
@@ -1691,7 +1687,7 @@ static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb *p_Sccb)
                                                }
                                        }
                                        MENABLE_INT(ioport);
-                                       return (0);
+                                       return 0;
                                } else {
                                        currTar_Info =
                                            &FPT_sccbMgrTbl[thisCard][p_Sccb->
@@ -1702,13 +1698,13 @@ static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb *p_Sccb)
                                                      LunDiscQ_Idx[p_Sccb->Lun]]
                                            == p_Sccb) {
                                                p_Sccb->SccbStatus = SCCB_ABORT;
-                                               return (0);
+                                               return 0;
                                        }
                                }
                        }
                }
        }
-       return (-1);
+       return -1;
 }
 
 /*---------------------------------------------------------------------
@@ -1726,12 +1722,12 @@ static unsigned char FlashPoint_InterruptPending(unsigned long pCurrCard)
        ioport = ((struct sccb_card *)pCurrCard)->ioPort;
 
        if (RD_HARPOON(ioport + hp_int_status) & INT_ASSERTED) {
-               return (1);
+               return 1;
        }
 
        else
 
-               return (0);
+               return 0;
 }
 
 /*---------------------------------------------------------------------
@@ -1783,7 +1779,7 @@ static int FlashPoint_HandleInterrupt(unsigned long pCurrCard)
                        if (result) {
 
                                MENABLE_INT(ioport);
-                               return (result);
+                               return result;
                        }
                }
 
@@ -1997,7 +1993,7 @@ static int FlashPoint_HandleInterrupt(unsigned long pCurrCard)
 
        MENABLE_INT(ioport);
 
-       return (0);
+       return 0;
 }
 
 /*---------------------------------------------------------------------
@@ -2092,7 +2088,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port,
 
                FPT_scini(p_card, pCurrCard->ourId, 0);
 
-               return (0xFF);
+               return 0xFF;
        }
 
        else if (p_int & FIFO) {
@@ -2150,7 +2146,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port,
                WRW_HARPOON((p_port + hp_intstat), SCAM_SEL);
        }
 
-       return (0x00);
+       return 0x00;
 }
 
 /*---------------------------------------------------------------------
@@ -2295,12 +2291,12 @@ static unsigned char FPT_sfm(unsigned long port, struct sccb *pCurrSCCB)
                        }
                        if (TimeOutLoop > 20000) {
                                WRW_HARPOON((port + hp_intstat), PARITY);
-                               return (message);
+                               return message;
                        }
                        if ((RD_HARPOON(port + hp_scsisig) & S_SCSI_PHZ) !=
                            S_MSGI_PH) {
                                WRW_HARPOON((port + hp_intstat), PARITY);
-                               return (message);
+                               return message;
                        }
                        WR_HARPOON(port + hp_portctrl_0, SCSI_PORT);
 
@@ -2315,7 +2311,7 @@ static unsigned char FPT_sfm(unsigned long port, struct sccb *pCurrSCCB)
        WR_HARPOON(port + hp_xferstat, 0);
        WR_HARPOON(port + hp_fiforead, 0);
        WR_HARPOON(port + hp_fifowrite, 0);
-       return (message);
+       return message;
 }
 
 /*---------------------------------------------------------------------
@@ -3219,14 +3215,14 @@ static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card,
                                   (AUTO_IMMED + CMD_ONLY_STRT));
                }
 
-               return (1);
+               return 1;
        }
 
        else {
 
                currTar_Info->TarStatus |= (unsigned char)SYNC_SUPPORTED;
                currTar_Info->TarEEValue &= ~EE_SYNC_MASK;
-               return (0);
+               return 0;
        }
 }
 
@@ -3431,7 +3427,7 @@ static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
                                            ~(unsigned char)TAR_WIDE_MASK) |
                                           (unsigned char)WIDE_ENABLED);
 
-               return (1);
+               return 1;
        }
 
        else {
@@ -3441,7 +3437,7 @@ static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
                                           WIDE_NEGOCIATED);
 
                currTar_Info->TarEEValue &= ~EE_WIDE_SCSI;
-               return (0);
+               return 0;
        }
 }
 
@@ -5155,11 +5151,11 @@ static unsigned char FPT_busMstrTimeOut(unsigned long p_port)
        RD_HARPOON(p_port + hp_int_status);     /*Clear command complete */
 
        if (RD_HARPOON(p_port + hp_ext_status) & BM_CMD_BUSY) {
-               return (1);
+               return 1;
        }
 
        else {
-               return (0);
+               return 0;
        }
 }
 
@@ -5721,10 +5717,10 @@ static int FPT_scarb(unsigned long p_port, unsigned char p_sel_type)
                }
 
                if (RD_HARPOON(p_port + hp_scsisig) & SCSI_SEL)
-                       return (0);
+                       return 0;
 
                if (RD_HARPOON(p_port + hp_scsidata_0) != 00)
-                       return (0);
+                       return 0;
 
                WR_HARPOON(p_port + hp_scsisig,
                           (RD_HARPOON(p_port + hp_scsisig) | SCSI_BSY));
@@ -5734,7 +5730,7 @@ static int FPT_scarb(unsigned long p_port, unsigned char p_sel_type)
                        WR_HARPOON(p_port + hp_scsisig,
                                   (RD_HARPOON(p_port + hp_scsisig) &
                                    ~SCSI_BSY));
-                       return (0);
+                       return 0;
                }
 
                WR_HARPOON(p_port + hp_scsisig,
@@ -5745,7 +5741,7 @@ static int FPT_scarb(unsigned long p_port, unsigned char p_sel_type)
                        WR_HARPOON(p_port + hp_scsisig,
                                   (RD_HARPOON(p_port + hp_scsisig) &
                                    ~(SCSI_BSY | SCSI_SEL)));
-                       return (0);
+                       return 0;
                }
        }
 
@@ -5764,7 +5760,7 @@ static int FPT_scarb(unsigned long p_port, unsigned char p_sel_type)
 
        FPT_Wait(p_port, TO_250ms);
 
-       return (1);
+       return 1;
 }
 
 /*---------------------------------------------------------------------
@@ -5956,7 +5952,7 @@ static unsigned char FPT_scxferc(unsigned long p_port, unsigned char p_data)
 
        FPT_scwirod(p_port, BIT(6));    /*Wait for DB6 to be released. */
 
-       return (ret_data);
+       return ret_data;
 }
 
 /*---------------------------------------------------------------------
@@ -5994,22 +5990,22 @@ static unsigned char FPT_scsendi(unsigned long p_port,
                        }
 
                        if ((ret_data & 0x1C) == 0x10)
-                               return (0x00);  /*End of isolation stage, we won! */
+                               return 0x00;    /*End of isolation stage, we won! */
 
                        if (ret_data & 0x1C)
-                               return (0xFF);
+                               return 0xFF;
 
                        if ((defer) && (!(ret_data & 0x1F)))
-                               return (0x01);  /*End of isolation stage, we lost. */
+                               return 0x01;    /*End of isolation stage, we lost. */
 
                }               /*bit loop */
 
        }                       /*byte loop */
 
        if (defer)
-               return (0x01);  /*We lost */
+               return 0x01;    /*We lost */
        else
-               return (0);     /*We WON! Yeeessss! */
+               return 0;       /*We WON! Yeeessss! */
 }
 
 /*---------------------------------------------------------------------
@@ -6034,7 +6030,7 @@ static unsigned char FPT_sciso(unsigned long p_port,
                        ret_data = FPT_scxferc(p_port, 0);
 
                        if (ret_data & 0xFC)
-                               return (0xFF);
+                               return 0xFF;
 
                        else {
 
@@ -6056,9 +6052,9 @@ static unsigned char FPT_sciso(unsigned long p_port,
                                }
 */
                                if (byte_cnt)
-                                       return (0x00);
+                                       return 0x00;
                                else
-                                       return (0xFF);
+                                       return 0xFF;
                        }
 
                }               /*bit loop */
@@ -6067,7 +6063,7 @@ static unsigned char FPT_sciso(unsigned long p_port,
 
        }                       /*byte loop */
 
-       return (0);
+       return 0;
 }
 
 /*---------------------------------------------------------------------
@@ -6142,10 +6138,10 @@ static unsigned char FPT_scvalq(unsigned char p_quintet)
        }
 
        if (p_quintet & 0x18)
-               return (0);
+               return 0;
 
        else
-               return (1);
+               return 1;
 }
 
 /*---------------------------------------------------------------------
@@ -6209,7 +6205,7 @@ static unsigned char FPT_scsell(unsigned long p_port, unsigned char targ_id)
                           (RD_HARPOON(p_port + hp_page_ctrl) &
                            ~G_INT_DISABLE));
 
-               return (0);     /*No legacy device */
+               return 0;       /*No legacy device */
        }
 
        else {
@@ -6228,7 +6224,7 @@ static unsigned char FPT_scsell(unsigned long p_port, unsigned char targ_id)
                           (RD_HARPOON(p_port + hp_page_ctrl) &
                            ~G_INT_DISABLE));
 
-               return (1);     /*Found one of them oldies! */
+               return 1;       /*Found one of them oldies! */
        }
 }
 
@@ -6342,7 +6338,7 @@ static unsigned char FPT_scmachid(unsigned char p_card,
 
                if (match) {
                        FPT_scamInfo[i].state = ID_ASSIGNED;
-                       return (i);
+                       return i;
                }
 
        }
@@ -6372,7 +6368,7 @@ static unsigned char FPT_scmachid(unsigned char p_card,
                        if (FPT_BL_Card[p_card].pNvRamInfo == NULL)
                                FPT_BL_Card[p_card].globalFlags |=
                                    F_UPDATE_EEPROM;
-                       return (match);
+                       return match;
 
                }
 
@@ -6387,7 +6383,7 @@ static unsigned char FPT_scmachid(unsigned char p_card,
        }
 
        if (p_id_string[0] & BIT(7)) {
-               return (CLR_PRIORITY);
+               return CLR_PRIORITY;
        }
 
        if (p_id_string[0] & BIT(5))
@@ -6416,7 +6412,7 @@ static unsigned char FPT_scmachid(unsigned char p_card,
                        if (FPT_BL_Card[p_card].pNvRamInfo == NULL)
                                FPT_BL_Card[p_card].globalFlags |=
                                    F_UPDATE_EEPROM;
-                       return (match);
+                       return match;
 
                }
 
@@ -6430,7 +6426,7 @@ static unsigned char FPT_scmachid(unsigned char p_card,
                }
        }
 
-       return (NO_ID_AVAIL);
+       return NO_ID_AVAIL;
 }
 
 /*---------------------------------------------------------------------
@@ -7181,7 +7177,7 @@ static unsigned char FPT_queueFindSccb(struct sccb *p_SCCB,
 
                        currTar_Info->TarSelQ_Cnt--;
 
-                       return (1);
+                       return 1;
                }
 
                else {
@@ -7189,7 +7185,7 @@ static unsigned char FPT_queueFindSccb(struct sccb *p_SCCB,
                }
        }
 
-       return (0);
+       return 0;
 
 }
 
@@ -7416,14 +7412,14 @@ static unsigned short FPT_utilEERead(unsigned long p_port,
                ee_data2 = FPT_utilEEReadOrg(p_port, ee_addr);
 
                if (ee_data1 == ee_data2)
-                       return (ee_data1);
+                       return ee_data1;
 
                ee_data1 = ee_data2;
                i++;
 
        } while (i < 4);
 
-       return (ee_data1);
+       return ee_data1;
 }
 
 /*---------------------------------------------------------------------
@@ -7471,7 +7467,7 @@ static unsigned short FPT_utilEEReadOrg(unsigned long p_port,
        WR_HARPOON(p_port + hp_ee_ctrl, (ee_value | SEE_MS));   /*Turn off CS */
        WR_HARPOON(p_port + hp_ee_ctrl, ee_value);      /*Turn off Master Select */
 
-       return (ee_data);
+       return ee_data;
 }
 
 /*---------------------------------------------------------------------
@@ -7559,7 +7555,7 @@ static unsigned short FPT_CalcCrc16(unsigned char buffer[])
                        ch >>= 1;
                }
        }
-       return (crc);
+       return crc;
 }
 
 static unsigned char FPT_CalcLrc(unsigned char buffer[])
@@ -7569,7 +7565,7 @@ static unsigned char FPT_CalcLrc(unsigned char buffer[])
        lrc = 0;
        for (i = 0; i < ID_STRING_LENGTH; i++)
                lrc ^= buffer[i];
-       return (lrc);
+       return lrc;
 }
 
 /*
@@ -7610,7 +7606,7 @@ FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle,
        FlashPoint_AbortCCB(CardHandle, (struct sccb *)CCB);
 }
 
-static inline boolean
+static inline bool
 FlashPoint__InterruptPending(FlashPoint_CardHandle_T CardHandle)
 {
        return FlashPoint_InterruptPending(CardHandle);
@@ -7630,7 +7626,7 @@ FlashPoint__HandleInterrupt(FlashPoint_CardHandle_T CardHandle)
 #define FlashPoint_InterruptPending        FlashPoint__InterruptPending
 #define FlashPoint_HandleInterrupt         FlashPoint__HandleInterrupt
 
-#else                          /* CONFIG_SCSI_OMIT_FLASHPOINT */
+#else                          /* !CONFIG_SCSI_FLASHPOINT */
 
 /*
   Define prototypes for the FlashPoint SCCB Manager Functions.
@@ -7641,8 +7637,8 @@ extern FlashPoint_CardHandle_T
 FlashPoint_HardwareResetHostAdapter(struct FlashPoint_Info *);
 extern void FlashPoint_StartCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *);
 extern int FlashPoint_AbortCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *);
-extern boolean FlashPoint_InterruptPending(FlashPoint_CardHandle_T);
+extern bool FlashPoint_InterruptPending(FlashPoint_CardHandle_T);
 extern int FlashPoint_HandleInterrupt(FlashPoint_CardHandle_T);
 extern void FlashPoint_ReleaseHostAdapter(FlashPoint_CardHandle_T);
 
-#endif                         /* CONFIG_SCSI_OMIT_FLASHPOINT */
+#endif                         /* CONFIG_SCSI_FLASHPOINT */