Skip to content

Commit

Permalink
staging: ath6kl: Remove A_BOOL and TRUE/FALSE
Browse files Browse the repository at this point in the history 
Use kernel bool and true/false.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Feb 2, 2011
1 parent 949c367 commit 1071a13
Show file tree
Hide file tree
Showing 57 changed files with 969 additions and 978 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/ath6kl/bmi/include/bmi_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#define BMI_COMMUNICATION_TIMEOUT 100000

/* ------ Global Variable Declarations ------- */
static A_BOOL bmiDone;
static bool bmiDone;

int
bmiBufferSend(HIF_DEVICE *device,
Expand All @@ -50,6 +50,6 @@ int
bmiBufferReceive(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length,
A_BOOL want_timeout);
bool want_timeout);

#endif
28 changes: 14 additions & 14 deletions drivers/staging/ath6kl/bmi/src/bmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ and does not use the HTC protocol nor even DMA -- it is intentionally kept
very simple.
*/

static A_BOOL pendingEventsFuncCheck = FALSE;
static bool pendingEventsFuncCheck = false;
static A_UINT32 *pBMICmdCredits;
static A_UCHAR *pBMICmdBuf;
#define MAX_BMI_CMDBUF_SZ (BMI_DATASZ_MAX + \
Expand All @@ -66,8 +66,8 @@ static A_UCHAR *pBMICmdBuf;
void
BMIInit(void)
{
bmiDone = FALSE;
pendingEventsFuncCheck = FALSE;
bmiDone = false;
pendingEventsFuncCheck = false;

/*
* On some platforms, it's not possible to DMA to a static variable
Expand Down Expand Up @@ -117,7 +117,7 @@ BMIDone(HIF_DEVICE *device)
}

AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Enter (device: 0x%p)\n", device));
bmiDone = TRUE;
bmiDone = true;
cid = BMI_DONE;

status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
Expand Down Expand Up @@ -162,7 +162,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
}

status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_ver,
sizeof(targ_info->target_ver), TRUE);
sizeof(targ_info->target_ver), true);
if (status != A_OK) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Version from the device\n"));
return A_ERROR;
Expand All @@ -171,7 +171,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
if (targ_info->target_ver == TARGET_VERSION_SENTINAL) {
/* Determine how many bytes are in the Target's targ_info */
status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_info_byte_count,
sizeof(targ_info->target_info_byte_count), TRUE);
sizeof(targ_info->target_info_byte_count), true);
if (status != A_OK) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info Byte Count from the device\n"));
return A_ERROR;
Expand All @@ -186,7 +186,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
/* Read the remainder of the targ_info */
status = bmiBufferReceive(device,
((A_UCHAR *)targ_info)+sizeof(targ_info->target_info_byte_count),
sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count), TRUE);
sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count), true);
if (status != A_OK) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info (%d bytes) from the device\n",
targ_info->target_info_byte_count));
Expand Down Expand Up @@ -243,7 +243,7 @@ BMIReadMemory(HIF_DEVICE *device,
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
status = bmiBufferReceive(device, pBMICmdBuf, rxlen, TRUE);
status = bmiBufferReceive(device, pBMICmdBuf, rxlen, true);
if (status != A_OK) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
Expand Down Expand Up @@ -357,7 +357,7 @@ BMIExecute(HIF_DEVICE *device,
return A_ERROR;
}

status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*param), FALSE);
status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*param), false);
if (status != A_OK) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
Expand Down Expand Up @@ -441,7 +441,7 @@ BMIReadSOCRegister(HIF_DEVICE *device,
return A_ERROR;
}

status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*param), TRUE);
status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*param), true);
if (status != A_OK) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
Expand Down Expand Up @@ -537,7 +537,7 @@ BMIrompatchInstall(HIF_DEVICE *device,
return A_ERROR;
}

status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*rompatch_id), TRUE);
status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*rompatch_id), true);
if (status != A_OK) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
Expand Down Expand Up @@ -785,7 +785,7 @@ int
bmiBufferReceive(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length,
A_BOOL want_timeout)
bool want_timeout)
{
int status;
A_UINT32 address;
Expand All @@ -800,7 +800,7 @@ bmiBufferReceive(HIF_DEVICE *device,
HIF_DEVICE_GET_PENDING_EVENTS_FUNC,
&getPendingEventsFunc,
sizeof(getPendingEventsFunc));
pendingEventsFuncCheck = TRUE;
pendingEventsFuncCheck = true;
}

HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
Expand Down Expand Up @@ -1004,7 +1004,7 @@ BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length)
}

int
BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, A_BOOL want_timeout)
BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, bool want_timeout)
{
return bmiBufferReceive(device, buffer, length, want_timeout);
}
2 changes: 1 addition & 1 deletion drivers/staging/ath6kl/hif/common/hif_sdio_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static INLINE void SetExtendedMboxWindowInfo(A_UINT16 Manfid, HIF_DEVICE_MBOX_IN
pInfo->GMboxSize = HIF_GMBOX_WIDTH;
break;
default:
A_ASSERT(FALSE);
A_ASSERT(false);
break;
}
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ struct hif_device {
HTC_CALLBACKS htcCallbacks;
A_UINT8 *dma_buffer;
DL_LIST ScatterReqHead; /* scatter request list head */
A_BOOL scatter_enabled; /* scatter enabled flag */
A_BOOL is_suspend;
A_BOOL is_disabled;
bool scatter_enabled; /* scatter enabled flag */
bool is_suspend;
bool is_disabled;
atomic_t irqHandling;
HIF_DEVICE_POWER_CHANGE_TYPE powerConfig;
const struct sdio_device_id *id;
Expand Down
28 changes: 14 additions & 14 deletions drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*/
#define BUFFER_NEEDS_BOUNCE(buffer) (((unsigned long)(buffer) & 0x3) || !virt_addr_valid((buffer)))
#else
#define BUFFER_NEEDS_BOUNCE(buffer) (FALSE)
#define BUFFER_NEEDS_BOUNCE(buffer) (false)
#endif

/* ATHENV */
Expand Down Expand Up @@ -164,7 +164,7 @@ __HIFReadWrite(HIF_DEVICE *device,
int status = A_OK;
int ret;
A_UINT8 *tbuffer;
A_BOOL bounced = FALSE;
bool bounced = false;

AR_DEBUG_ASSERT(device != NULL);
AR_DEBUG_ASSERT(device->func != NULL);
Expand Down Expand Up @@ -243,7 +243,7 @@ __HIFReadWrite(HIF_DEVICE *device,
/* copy the write data to the dma buffer */
AR_DEBUG_ASSERT(length <= HIF_DMA_BUFFER_SIZE);
memcpy(tbuffer, buffer, length);
bounced = TRUE;
bounced = true;
} else {
tbuffer = buffer;
}
Expand All @@ -265,7 +265,7 @@ __HIFReadWrite(HIF_DEVICE *device,
AR_DEBUG_ASSERT(device->dma_buffer != NULL);
AR_DEBUG_ASSERT(length <= HIF_DMA_BUFFER_SIZE);
tbuffer = device->dma_buffer;
bounced = TRUE;
bounced = true;
} else {
tbuffer = buffer;
}
Expand Down Expand Up @@ -299,7 +299,7 @@ __HIFReadWrite(HIF_DEVICE *device,
("AR6000: SDIO bus operation failed! MMC stack returned : %d \n", ret));
status = A_ERROR;
}
} while (FALSE);
} while (false);

return status;
}
Expand Down Expand Up @@ -725,7 +725,7 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
}
status = SetupHIFScatterSupport(device, (HIF_DEVICE_SCATTER_SUPPORT_INFO *)config);
if (status) {
device->scatter_enabled = FALSE;
device->scatter_enabled = false;
}
break;
case HIF_DEVICE_GET_OS_DEVICE:
Expand Down Expand Up @@ -837,7 +837,7 @@ static int hifDeviceInserted(struct sdio_func *func, const struct sdio_device_id
device = getHifDevice(func);

device->id = id;
device->is_disabled = TRUE;
device->is_disabled = true;

spin_lock_init(&device->lock);

Expand All @@ -848,7 +848,7 @@ static int hifDeviceInserted(struct sdio_func *func, const struct sdio_device_id
if (!nohifscattersupport) {
/* try to allow scatter operation on all instances,
* unless globally overridden */
device->scatter_enabled = TRUE;
device->scatter_enabled = true;
}

/* Initialize the bus requests to be used later */
Expand Down Expand Up @@ -989,7 +989,7 @@ static int hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func)
sdio_release_host(device->func);

if (status == A_OK) {
device->is_disabled = TRUE;
device->is_disabled = true;
}
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDisableFunc\n"));

Expand Down Expand Up @@ -1036,7 +1036,7 @@ static int hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func)
__FUNCTION__, HIF_MBOX_BLOCK_SIZE, ret));
return A_ERROR;
}
device->is_disabled = FALSE;
device->is_disabled = false;
/* create async I/O thread */
if (!device->async_task) {
device->async_shutdown = 0;
Expand Down Expand Up @@ -1086,10 +1086,10 @@ static int hifDeviceSuspend(struct device *dev)
device = getHifDevice(func);
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDeviceSuspend\n"));
if (device && device->claimedContext && osdrvCallbacks.deviceSuspendHandler) {
device->is_suspend = TRUE; /* set true first for PowerStateChangeNotify(..) */
device->is_suspend = true; /* set true first for PowerStateChangeNotify(..) */
status = osdrvCallbacks.deviceSuspendHandler(device->claimedContext);
if (status != A_OK) {
device->is_suspend = FALSE;
device->is_suspend = false;
}
}
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDeviceSuspend\n"));
Expand All @@ -1115,7 +1115,7 @@ static int hifDeviceResume(struct device *dev)
if (device && device->claimedContext && osdrvCallbacks.deviceSuspendHandler) {
status = osdrvCallbacks.deviceResumeHandler(device->claimedContext);
if (status == A_OK) {
device->is_suspend = FALSE;
device->is_suspend = false;
}
}
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDeviceResume\n"));
Expand All @@ -1137,7 +1137,7 @@ static void hifDeviceRemoved(struct sdio_func *func)
}

if (device->is_disabled) {
device->is_disabled = FALSE;
device->is_disabled = false;
} else {
status = hifDisableFunc(device, func);
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ static int HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
}

if (pReq->TotalLength == 0) {
A_ASSERT(FALSE);
A_ASSERT(false);
break;
}

Expand All @@ -263,7 +263,7 @@ static int HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
status = A_OK;
}

} while (FALSE);
} while (false);

if (status && (request & HIF_ASYNCHRONOUS)) {
pReq->CompletionStatus = status;
Expand Down Expand Up @@ -346,7 +346,7 @@ int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *

status = A_OK;

} while (FALSE);
} while (false);

if (status) {
CleanupHIFScatterResources(device);
Expand Down
Loading

0 comments on commit 1071a13

Please sign in to comment.