Skip to content

L
linux
Commit 2065e310 authored by Richard Knutsson's avatar Richard Knutsson Committed by James Bottomley
Browse files
Options

[SCSI] BusLogic: Replace 'boolean' by 'bool' 

Signed-off-by: default avatarRichard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 35d68483
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 176 deletions
drivers/scsi/BusLogic.c
View file @ 2065e310
...@@ -192,7 +192,7 @@ static void BusLogic_InitializeCCBs(struct BusLogic_HostAdapter *HostAdapter, vo ...@@ -192,7 +192,7 @@ static void BusLogic_InitializeCCBs(struct BusLogic_HostAdapter *HostAdapter, vo
BusLogic_CreateInitialCCBs allocates the initial CCBs for Host Adapter. BusLogic_CreateInitialCCBs allocates the initial CCBs for Host Adapter.
*/ */
static boolean __init BusLogic_CreateInitialCCBs(struct BusLogic_HostAdapter *HostAdapter) static bool __init BusLogic_CreateInitialCCBs(struct BusLogic_HostAdapter *HostAdapter)
{ {
int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB);
void *BlockPointer; void *BlockPointer;
...@@ -238,7 +238,7 @@ static void BusLogic_DestroyCCBs(struct BusLogic_HostAdapter *HostAdapter) ...@@ -238,7 +238,7 @@ static void BusLogic_DestroyCCBs(struct BusLogic_HostAdapter *HostAdapter)
multiple host adapters share the same IRQ Channel. multiple host adapters share the same IRQ Channel.
*/ */
static void BusLogic_CreateAdditionalCCBs(struct BusLogic_HostAdapter *HostAdapter, int AdditionalCCBs, boolean SuccessMessageP) static void BusLogic_CreateAdditionalCCBs(struct BusLogic_HostAdapter *HostAdapter, int AdditionalCCBs, bool SuccessMessageP)
{ {
int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB);
int PreviouslyAllocated = HostAdapter->AllocatedCCBs; int PreviouslyAllocated = HostAdapter->AllocatedCCBs;
...@@ -637,9 +637,9 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd ...@@ -637,9 +637,9 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd
struct BusLogic_ProbeInfo *PrimaryProbeInfo = &BusLogic_ProbeInfoList[BusLogic_ProbeInfoCount]; struct BusLogic_ProbeInfo *PrimaryProbeInfo = &BusLogic_ProbeInfoList[BusLogic_ProbeInfoCount];
int NonPrimaryPCIMultiMasterIndex = BusLogic_ProbeInfoCount + 1; int NonPrimaryPCIMultiMasterIndex = BusLogic_ProbeInfoCount + 1;
int NonPrimaryPCIMultiMasterCount = 0, PCIMultiMasterCount = 0; int NonPrimaryPCIMultiMasterCount = 0, PCIMultiMasterCount = 0;
boolean ForceBusDeviceScanningOrder = false; bool ForceBusDeviceScanningOrder = false;
boolean ForceBusDeviceScanningOrderChecked = false; bool ForceBusDeviceScanningOrderChecked = false;
boolean StandardAddressSeen[6]; bool StandardAddressSeen[6];
struct pci_dev *PCI_Device = NULL; struct pci_dev *PCI_Device = NULL;
int i; int i;
if (BusLogic_ProbeInfoCount >= BusLogic_MaxHostAdapters) if (BusLogic_ProbeInfoCount >= BusLogic_MaxHostAdapters)
...@@ -1009,7 +1009,7 @@ static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter ...@@ -1009,7 +1009,7 @@ static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
BusLogic_Failure prints a standardized error message, and then returns false. BusLogic_Failure prints a standardized error message, and then returns false.
*/ */
static boolean BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char *ErrorMessage) static bool BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char *ErrorMessage)
{ {
BusLogic_AnnounceDriver(HostAdapter); BusLogic_AnnounceDriver(HostAdapter);
if (HostAdapter->HostAdapterBusType == BusLogic_PCI_Bus) { if (HostAdapter->HostAdapterBusType == BusLogic_PCI_Bus) {
...@@ -1028,7 +1028,7 @@ static boolean BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char * ...@@ -1028,7 +1028,7 @@ static boolean BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char *
BusLogic_ProbeHostAdapter probes for a BusLogic Host Adapter. BusLogic_ProbeHostAdapter probes for a BusLogic Host Adapter.
*/ */
static boolean __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *HostAdapter) static bool __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *HostAdapter)
{ {
union BusLogic_StatusRegister StatusRegister; union BusLogic_StatusRegister StatusRegister;
union BusLogic_InterruptRegister InterruptRegister; union BusLogic_InterruptRegister InterruptRegister;
...@@ -1099,8 +1099,8 @@ static boolean __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *Hos ...@@ -1099,8 +1099,8 @@ static boolean __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *Hos
SCSI Bus Reset. SCSI Bus Reset.
*/ */
static boolean BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter static bool BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter
*HostAdapter, boolean HardReset) *HostAdapter, bool HardReset)
{ {
union BusLogic_StatusRegister StatusRegister; union BusLogic_StatusRegister StatusRegister;
int TimeoutCounter; int TimeoutCounter;
...@@ -1203,11 +1203,11 @@ static boolean BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter ...@@ -1203,11 +1203,11 @@ static boolean BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter
Host Adapter. Host Adapter.
*/ */
static boolean __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *HostAdapter) static bool __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *HostAdapter)
{ {
struct BusLogic_ExtendedSetupInformation ExtendedSetupInformation; struct BusLogic_ExtendedSetupInformation ExtendedSetupInformation;
unsigned char RequestedReplyLength; unsigned char RequestedReplyLength;
boolean Result = true; bool Result = true;
/* /*
FlashPoint Host Adapters do not require this protection. FlashPoint Host Adapters do not require this protection.
*/ */
...@@ -1237,7 +1237,7 @@ static boolean __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *Hos ...@@ -1237,7 +1237,7 @@ static boolean __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *Hos
from Host Adapter and initializes the Host Adapter structure. from Host Adapter and initializes the Host Adapter structure.
*/ */
static boolean __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_HostAdapter static bool __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_HostAdapter
*HostAdapter) *HostAdapter)
{ {
struct BusLogic_BoardID BoardID; struct BusLogic_BoardID BoardID;
...@@ -1684,14 +1684,14 @@ static boolean __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_Host ...@@ -1684,14 +1684,14 @@ static boolean __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_Host
Host Adapter. Host Adapter.
*/ */
static boolean __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_HostAdapter static bool __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_HostAdapter
*HostAdapter) *HostAdapter)
{ {
unsigned short AllTargetsMask = (1 << HostAdapter->MaxTargetDevices) - 1; unsigned short AllTargetsMask = (1 << HostAdapter->MaxTargetDevices) - 1;
unsigned short SynchronousPermitted, FastPermitted; unsigned short SynchronousPermitted, FastPermitted;
unsigned short UltraPermitted, WidePermitted; unsigned short UltraPermitted, WidePermitted;
unsigned short DisconnectPermitted, TaggedQueuingPermitted; unsigned short DisconnectPermitted, TaggedQueuingPermitted;
boolean CommonSynchronousNegotiation, CommonTaggedQueueDepth; bool CommonSynchronousNegotiation, CommonTaggedQueueDepth;
char SynchronousString[BusLogic_MaxTargetDevices + 1]; char SynchronousString[BusLogic_MaxTargetDevices + 1];
char WideString[BusLogic_MaxTargetDevices + 1]; char WideString[BusLogic_MaxTargetDevices + 1];
char DisconnectString[BusLogic_MaxTargetDevices + 1]; char DisconnectString[BusLogic_MaxTargetDevices + 1];
...@@ -1833,7 +1833,7 @@ static boolean __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_Ho ...@@ -1833,7 +1833,7 @@ static boolean __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_Ho
Host Adapter. Host Adapter.
*/ */
static boolean __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *HostAdapter) static bool __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *HostAdapter)
{ {
if (HostAdapter->IRQ_Channel == 0) { if (HostAdapter->IRQ_Channel == 0) {
BusLogic_Error("NO LEGAL INTERRUPT CHANNEL ASSIGNED - DETACHING\n", HostAdapter); BusLogic_Error("NO LEGAL INTERRUPT CHANNEL ASSIGNED - DETACHING\n", HostAdapter);
...@@ -1901,7 +1901,7 @@ static void BusLogic_ReleaseResources(struct BusLogic_HostAdapter *HostAdapter) ...@@ -1901,7 +1901,7 @@ static void BusLogic_ReleaseResources(struct BusLogic_HostAdapter *HostAdapter)
of the Host Adapter from its initial power on or hard reset state. of the Host Adapter from its initial power on or hard reset state.
*/ */
static boolean BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter static bool BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter
*HostAdapter) *HostAdapter)
{ {
struct BusLogic_ExtendedMailboxRequest ExtendedMailboxRequest; struct BusLogic_ExtendedMailboxRequest ExtendedMailboxRequest;
...@@ -2000,7 +2000,7 @@ static boolean BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter ...@@ -2000,7 +2000,7 @@ static boolean BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter
through Host Adapter. through Host Adapter.
*/ */
static boolean __init BusLogic_TargetDeviceInquiry(struct BusLogic_HostAdapter static bool __init BusLogic_TargetDeviceInquiry(struct BusLogic_HostAdapter
*HostAdapter) *HostAdapter)
{ {
u16 InstalledDevices; u16 InstalledDevices;
...@@ -2737,7 +2737,7 @@ static irqreturn_t BusLogic_InterruptHandler(int IRQ_Channel, void *DeviceIdenti ...@@ -2737,7 +2737,7 @@ static irqreturn_t BusLogic_InterruptHandler(int IRQ_Channel, void *DeviceIdenti
already have been acquired by the caller. already have been acquired by the caller.
*/ */
static boolean BusLogic_WriteOutgoingMailbox(struct BusLogic_HostAdapter static bool BusLogic_WriteOutgoingMailbox(struct BusLogic_HostAdapter
*HostAdapter, enum BusLogic_ActionCode ActionCode, struct BusLogic_CCB *CCB) *HostAdapter, enum BusLogic_ActionCode ActionCode, struct BusLogic_CCB *CCB)
{ {
struct BusLogic_OutgoingMailbox *NextOutgoingMailbox; struct BusLogic_OutgoingMailbox *NextOutgoingMailbox;
...@@ -3056,7 +3056,7 @@ static int BusLogic_AbortCommand(struct scsi_cmnd *Command) ...@@ -3056,7 +3056,7 @@ static int BusLogic_AbortCommand(struct scsi_cmnd *Command)
currently executing SCSI Commands as having been Reset. currently executing SCSI Commands as having been Reset.
*/ */
static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *HostAdapter, boolean HardReset) static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *HostAdapter, bool HardReset)
{ {
struct BusLogic_CCB *CCB; struct BusLogic_CCB *CCB;
int TargetID; int TargetID;
...@@ -3307,7 +3307,7 @@ Target Requested Completed Requested Completed Requested Completed\n\ ...@@ -3307,7 +3307,7 @@ Target Requested Completed Requested Completed Requested Completed\n\
static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Format, struct BusLogic_HostAdapter *HostAdapter, ...) static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Format, struct BusLogic_HostAdapter *HostAdapter, ...)
{ {
static char Buffer[BusLogic_LineBufferSize]; static char Buffer[BusLogic_LineBufferSize];
static boolean BeginningOfLine = true; static bool BeginningOfLine = true;
va_list Arguments; va_list Arguments;
int Length = 0; int Length = 0;
va_start(Arguments, HostAdapter); va_start(Arguments, HostAdapter);
...@@ -3345,7 +3345,7 @@ static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Form ...@@ -3345,7 +3345,7 @@ static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Form
and updates the pointer if the keyword is recognized and false otherwise. and updates the pointer if the keyword is recognized and false otherwise.
*/ */
static boolean __init BusLogic_ParseKeyword(char **StringPointer, char *Keyword) static bool __init BusLogic_ParseKeyword(char **StringPointer, char *Keyword)
{ {
char *Pointer = *StringPointer; char *Pointer = *StringPointer;
while (*Keyword != '\0') { while (*Keyword != '\0') {
......
drivers/scsi/BusLogic.h
View file @ 2065e310
This diff is collapsed.
drivers/scsi/FlashPoint.c
View file @ 2065e310
...@@ -7609,7 +7609,7 @@ FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle, ...@@ -7609,7 +7609,7 @@ FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle,
FlashPoint_AbortCCB(CardHandle, (struct sccb *)CCB); FlashPoint_AbortCCB(CardHandle, (struct sccb *)CCB);
} }
static inline boolean static inline bool
FlashPoint__InterruptPending(FlashPoint_CardHandle_T CardHandle) FlashPoint__InterruptPending(FlashPoint_CardHandle_T CardHandle)
{ {
return FlashPoint_InterruptPending(CardHandle); return FlashPoint_InterruptPending(CardHandle);
...@@ -7640,7 +7640,7 @@ extern FlashPoint_CardHandle_T ...@@ -7640,7 +7640,7 @@ extern FlashPoint_CardHandle_T
FlashPoint_HardwareResetHostAdapter(struct FlashPoint_Info *); FlashPoint_HardwareResetHostAdapter(struct FlashPoint_Info *);
extern void FlashPoint_StartCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *); extern void FlashPoint_StartCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *);
extern int FlashPoint_AbortCCB(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 int FlashPoint_HandleInterrupt(FlashPoint_CardHandle_T);
extern void FlashPoint_ReleaseHostAdapter(FlashPoint_CardHandle_T); extern void FlashPoint_ReleaseHostAdapter(FlashPoint_CardHandle_T);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7