diff options
author | Richard Knutsson <ricknu-0@student.ltu.se> | 2007-02-05 19:39:01 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-07 18:32:29 -0500 |
commit | 2065e310cc116e4b2b0f42faaf27f0c9baaca9cd (patch) | |
tree | 9b440296c5ce13ee9e62456c0737752212bf60a6 /drivers/scsi/BusLogic.c | |
parent | 35d6848322364b396484b5fcc450f6b009a3dac4 (diff) |
[SCSI] BusLogic: Replace 'boolean' by 'bool'
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/BusLogic.c')
-rw-r--r-- | drivers/scsi/BusLogic.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index 6272ec2125ec..e874b8944875 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c | |||
@@ -192,7 +192,7 @@ static void BusLogic_InitializeCCBs(struct BusLogic_HostAdapter *HostAdapter, vo | |||
192 | BusLogic_CreateInitialCCBs allocates the initial CCBs for Host Adapter. | 192 | BusLogic_CreateInitialCCBs allocates the initial CCBs for Host Adapter. |
193 | */ | 193 | */ |
194 | 194 | ||
195 | static boolean __init BusLogic_CreateInitialCCBs(struct BusLogic_HostAdapter *HostAdapter) | 195 | static bool __init BusLogic_CreateInitialCCBs(struct BusLogic_HostAdapter *HostAdapter) |
196 | { | 196 | { |
197 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); | 197 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); |
198 | void *BlockPointer; | 198 | void *BlockPointer; |
@@ -238,7 +238,7 @@ static void BusLogic_DestroyCCBs(struct BusLogic_HostAdapter *HostAdapter) | |||
238 | multiple host adapters share the same IRQ Channel. | 238 | multiple host adapters share the same IRQ Channel. |
239 | */ | 239 | */ |
240 | 240 | ||
241 | static void BusLogic_CreateAdditionalCCBs(struct BusLogic_HostAdapter *HostAdapter, int AdditionalCCBs, boolean SuccessMessageP) | 241 | static void BusLogic_CreateAdditionalCCBs(struct BusLogic_HostAdapter *HostAdapter, int AdditionalCCBs, bool SuccessMessageP) |
242 | { | 242 | { |
243 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); | 243 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); |
244 | int PreviouslyAllocated = HostAdapter->AllocatedCCBs; | 244 | int PreviouslyAllocated = HostAdapter->AllocatedCCBs; |
@@ -637,9 +637,9 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd | |||
637 | struct BusLogic_ProbeInfo *PrimaryProbeInfo = &BusLogic_ProbeInfoList[BusLogic_ProbeInfoCount]; | 637 | struct BusLogic_ProbeInfo *PrimaryProbeInfo = &BusLogic_ProbeInfoList[BusLogic_ProbeInfoCount]; |
638 | int NonPrimaryPCIMultiMasterIndex = BusLogic_ProbeInfoCount + 1; | 638 | int NonPrimaryPCIMultiMasterIndex = BusLogic_ProbeInfoCount + 1; |
639 | int NonPrimaryPCIMultiMasterCount = 0, PCIMultiMasterCount = 0; | 639 | int NonPrimaryPCIMultiMasterCount = 0, PCIMultiMasterCount = 0; |
640 | boolean ForceBusDeviceScanningOrder = false; | 640 | bool ForceBusDeviceScanningOrder = false; |
641 | boolean ForceBusDeviceScanningOrderChecked = false; | 641 | bool ForceBusDeviceScanningOrderChecked = false; |
642 | boolean StandardAddressSeen[6]; | 642 | bool StandardAddressSeen[6]; |
643 | struct pci_dev *PCI_Device = NULL; | 643 | struct pci_dev *PCI_Device = NULL; |
644 | int i; | 644 | int i; |
645 | if (BusLogic_ProbeInfoCount >= BusLogic_MaxHostAdapters) | 645 | if (BusLogic_ProbeInfoCount >= BusLogic_MaxHostAdapters) |
@@ -1009,7 +1009,7 @@ static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter | |||
1009 | BusLogic_Failure prints a standardized error message, and then returns false. | 1009 | BusLogic_Failure prints a standardized error message, and then returns false. |
1010 | */ | 1010 | */ |
1011 | 1011 | ||
1012 | static boolean BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char *ErrorMessage) | 1012 | static bool BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char *ErrorMessage) |
1013 | { | 1013 | { |
1014 | BusLogic_AnnounceDriver(HostAdapter); | 1014 | BusLogic_AnnounceDriver(HostAdapter); |
1015 | if (HostAdapter->HostAdapterBusType == BusLogic_PCI_Bus) { | 1015 | if (HostAdapter->HostAdapterBusType == BusLogic_PCI_Bus) { |
@@ -1028,7 +1028,7 @@ static boolean BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char * | |||
1028 | BusLogic_ProbeHostAdapter probes for a BusLogic Host Adapter. | 1028 | BusLogic_ProbeHostAdapter probes for a BusLogic Host Adapter. |
1029 | */ | 1029 | */ |
1030 | 1030 | ||
1031 | static boolean __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *HostAdapter) | 1031 | static bool __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *HostAdapter) |
1032 | { | 1032 | { |
1033 | union BusLogic_StatusRegister StatusRegister; | 1033 | union BusLogic_StatusRegister StatusRegister; |
1034 | union BusLogic_InterruptRegister InterruptRegister; | 1034 | union BusLogic_InterruptRegister InterruptRegister; |
@@ -1099,8 +1099,8 @@ static boolean __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *Hos | |||
1099 | SCSI Bus Reset. | 1099 | SCSI Bus Reset. |
1100 | */ | 1100 | */ |
1101 | 1101 | ||
1102 | static boolean BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter | 1102 | static bool BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter |
1103 | *HostAdapter, boolean HardReset) | 1103 | *HostAdapter, bool HardReset) |
1104 | { | 1104 | { |
1105 | union BusLogic_StatusRegister StatusRegister; | 1105 | union BusLogic_StatusRegister StatusRegister; |
1106 | int TimeoutCounter; | 1106 | int TimeoutCounter; |
@@ -1203,11 +1203,11 @@ static boolean BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter | |||
1203 | Host Adapter. | 1203 | Host Adapter. |
1204 | */ | 1204 | */ |
1205 | 1205 | ||
1206 | static boolean __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *HostAdapter) | 1206 | static bool __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *HostAdapter) |
1207 | { | 1207 | { |
1208 | struct BusLogic_ExtendedSetupInformation ExtendedSetupInformation; | 1208 | struct BusLogic_ExtendedSetupInformation ExtendedSetupInformation; |
1209 | unsigned char RequestedReplyLength; | 1209 | unsigned char RequestedReplyLength; |
1210 | boolean Result = true; | 1210 | bool Result = true; |
1211 | /* | 1211 | /* |
1212 | FlashPoint Host Adapters do not require this protection. | 1212 | FlashPoint Host Adapters do not require this protection. |
1213 | */ | 1213 | */ |
@@ -1237,7 +1237,7 @@ static boolean __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *Hos | |||
1237 | from Host Adapter and initializes the Host Adapter structure. | 1237 | from Host Adapter and initializes the Host Adapter structure. |
1238 | */ | 1238 | */ |
1239 | 1239 | ||
1240 | static boolean __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_HostAdapter | 1240 | static bool __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_HostAdapter |
1241 | *HostAdapter) | 1241 | *HostAdapter) |
1242 | { | 1242 | { |
1243 | struct BusLogic_BoardID BoardID; | 1243 | struct BusLogic_BoardID BoardID; |
@@ -1684,14 +1684,14 @@ static boolean __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_Host | |||
1684 | Host Adapter. | 1684 | Host Adapter. |
1685 | */ | 1685 | */ |
1686 | 1686 | ||
1687 | static boolean __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_HostAdapter | 1687 | static bool __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_HostAdapter |
1688 | *HostAdapter) | 1688 | *HostAdapter) |
1689 | { | 1689 | { |
1690 | unsigned short AllTargetsMask = (1 << HostAdapter->MaxTargetDevices) - 1; | 1690 | unsigned short AllTargetsMask = (1 << HostAdapter->MaxTargetDevices) - 1; |
1691 | unsigned short SynchronousPermitted, FastPermitted; | 1691 | unsigned short SynchronousPermitted, FastPermitted; |
1692 | unsigned short UltraPermitted, WidePermitted; | 1692 | unsigned short UltraPermitted, WidePermitted; |
1693 | unsigned short DisconnectPermitted, TaggedQueuingPermitted; | 1693 | unsigned short DisconnectPermitted, TaggedQueuingPermitted; |
1694 | boolean CommonSynchronousNegotiation, CommonTaggedQueueDepth; | 1694 | bool CommonSynchronousNegotiation, CommonTaggedQueueDepth; |
1695 | char SynchronousString[BusLogic_MaxTargetDevices + 1]; | 1695 | char SynchronousString[BusLogic_MaxTargetDevices + 1]; |
1696 | char WideString[BusLogic_MaxTargetDevices + 1]; | 1696 | char WideString[BusLogic_MaxTargetDevices + 1]; |
1697 | char DisconnectString[BusLogic_MaxTargetDevices + 1]; | 1697 | char DisconnectString[BusLogic_MaxTargetDevices + 1]; |
@@ -1833,7 +1833,7 @@ static boolean __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_Ho | |||
1833 | Host Adapter. | 1833 | Host Adapter. |
1834 | */ | 1834 | */ |
1835 | 1835 | ||
1836 | static boolean __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *HostAdapter) | 1836 | static bool __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *HostAdapter) |
1837 | { | 1837 | { |
1838 | if (HostAdapter->IRQ_Channel == 0) { | 1838 | if (HostAdapter->IRQ_Channel == 0) { |
1839 | BusLogic_Error("NO LEGAL INTERRUPT CHANNEL ASSIGNED - DETACHING\n", HostAdapter); | 1839 | BusLogic_Error("NO LEGAL INTERRUPT CHANNEL ASSIGNED - DETACHING\n", HostAdapter); |
@@ -1901,7 +1901,7 @@ static void BusLogic_ReleaseResources(struct BusLogic_HostAdapter *HostAdapter) | |||
1901 | of the Host Adapter from its initial power on or hard reset state. | 1901 | of the Host Adapter from its initial power on or hard reset state. |
1902 | */ | 1902 | */ |
1903 | 1903 | ||
1904 | static boolean BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter | 1904 | static bool BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter |
1905 | *HostAdapter) | 1905 | *HostAdapter) |
1906 | { | 1906 | { |
1907 | struct BusLogic_ExtendedMailboxRequest ExtendedMailboxRequest; | 1907 | struct BusLogic_ExtendedMailboxRequest ExtendedMailboxRequest; |
@@ -2000,7 +2000,7 @@ static boolean BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter | |||
2000 | through Host Adapter. | 2000 | through Host Adapter. |
2001 | */ | 2001 | */ |
2002 | 2002 | ||
2003 | static boolean __init BusLogic_TargetDeviceInquiry(struct BusLogic_HostAdapter | 2003 | static bool __init BusLogic_TargetDeviceInquiry(struct BusLogic_HostAdapter |
2004 | *HostAdapter) | 2004 | *HostAdapter) |
2005 | { | 2005 | { |
2006 | u16 InstalledDevices; | 2006 | u16 InstalledDevices; |
@@ -2737,7 +2737,7 @@ static irqreturn_t BusLogic_InterruptHandler(int IRQ_Channel, void *DeviceIdenti | |||
2737 | already have been acquired by the caller. | 2737 | already have been acquired by the caller. |
2738 | */ | 2738 | */ |
2739 | 2739 | ||
2740 | static boolean BusLogic_WriteOutgoingMailbox(struct BusLogic_HostAdapter | 2740 | static bool BusLogic_WriteOutgoingMailbox(struct BusLogic_HostAdapter |
2741 | *HostAdapter, enum BusLogic_ActionCode ActionCode, struct BusLogic_CCB *CCB) | 2741 | *HostAdapter, enum BusLogic_ActionCode ActionCode, struct BusLogic_CCB *CCB) |
2742 | { | 2742 | { |
2743 | struct BusLogic_OutgoingMailbox *NextOutgoingMailbox; | 2743 | struct BusLogic_OutgoingMailbox *NextOutgoingMailbox; |
@@ -3056,7 +3056,7 @@ static int BusLogic_AbortCommand(struct scsi_cmnd *Command) | |||
3056 | currently executing SCSI Commands as having been Reset. | 3056 | currently executing SCSI Commands as having been Reset. |
3057 | */ | 3057 | */ |
3058 | 3058 | ||
3059 | static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *HostAdapter, boolean HardReset) | 3059 | static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *HostAdapter, bool HardReset) |
3060 | { | 3060 | { |
3061 | struct BusLogic_CCB *CCB; | 3061 | struct BusLogic_CCB *CCB; |
3062 | int TargetID; | 3062 | int TargetID; |
@@ -3307,7 +3307,7 @@ Target Requested Completed Requested Completed Requested Completed\n\ | |||
3307 | static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Format, struct BusLogic_HostAdapter *HostAdapter, ...) | 3307 | static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Format, struct BusLogic_HostAdapter *HostAdapter, ...) |
3308 | { | 3308 | { |
3309 | static char Buffer[BusLogic_LineBufferSize]; | 3309 | static char Buffer[BusLogic_LineBufferSize]; |
3310 | static boolean BeginningOfLine = true; | 3310 | static bool BeginningOfLine = true; |
3311 | va_list Arguments; | 3311 | va_list Arguments; |
3312 | int Length = 0; | 3312 | int Length = 0; |
3313 | va_start(Arguments, HostAdapter); | 3313 | va_start(Arguments, HostAdapter); |
@@ -3345,7 +3345,7 @@ static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Form | |||
3345 | and updates the pointer if the keyword is recognized and false otherwise. | 3345 | and updates the pointer if the keyword is recognized and false otherwise. |
3346 | */ | 3346 | */ |
3347 | 3347 | ||
3348 | static boolean __init BusLogic_ParseKeyword(char **StringPointer, char *Keyword) | 3348 | static bool __init BusLogic_ParseKeyword(char **StringPointer, char *Keyword) |
3349 | { | 3349 | { |
3350 | char *Pointer = *StringPointer; | 3350 | char *Pointer = *StringPointer; |
3351 | while (*Keyword != '\0') { | 3351 | while (*Keyword != '\0') { |