Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235738
b: refs/heads/master
c: 391bb21
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Jan 31, 2011
1 parent 529ebef commit eb44cf9
Show file tree
Hide file tree
Showing 21 changed files with 167 additions and 171 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 509c9d973055e3d98c0d2aa2cb40c9139526fd74
refs/heads/master: 391bb2116a4ffeeee75dfbbe2e9de678d2fac88d
6 changes: 3 additions & 3 deletions trunk/drivers/staging/ath6kl/bmi/src/bmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32
A_UINT32 unalignedBytes = length & 0x3;

status = BMILZStreamStart (device, address);
if (A_FAILED(status)) {
if (status) {
return A_ERROR;
}

Expand All @@ -977,7 +977,7 @@ BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32

status = BMILZData(device, buffer, lastWordOffset);

if (A_FAILED(status)) {
if (status) {
return A_ERROR;
}

Expand All @@ -990,7 +990,7 @@ BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32
// Close compressed stream and open a new (fake) one. This serves mainly to flush Target caches.
//
status = BMILZStreamStart (device, 0x00);
if (A_FAILED(status)) {
if (status) {
return A_ERROR;
}
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
return A_ENOTSUP;
}
status = SetupHIFScatterSupport(device, (HIF_DEVICE_SCATTER_SUPPORT_INFO *)config);
if (A_FAILED(status)) {
if (status) {
device->scatter_enabled = FALSE;
}
break;
Expand Down
6 changes: 3 additions & 3 deletions trunk/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 @@ -176,7 +176,7 @@ int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("HIF-SCATTER: data error: %d \n",data.error));
}

if (A_FAILED(status)) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("HIF-SCATTER: FAILED!!! (%s) Address: 0x%X, Block mode (BlockLen: %d, BlockCount: %d)\n",
(pReq->Request & HIF_WRITE) ? "WRITE":"READ",pReq->Address, data.blksz, data.blocks));
}
Expand Down Expand Up @@ -265,7 +265,7 @@ static int HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)

} while (FALSE);

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

} while (FALSE);

if (A_FAILED(status)) {
if (status) {
CleanupHIFScatterResources(device);
}

Expand Down
22 changes: 11 additions & 11 deletions trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ int DevSetup(AR6K_DEVICE *pDev)

status = HIFAttachHTC(pDev->HIFDevice, &htcCallbacks);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand Down Expand Up @@ -197,15 +197,15 @@ int DevSetup(AR6K_DEVICE *pDev)

status = DevDisableInterrupts(pDev);

if (A_FAILED(status)) {
if (status) {
break;
}

status = DevSetupGMbox(pDev);

} while (FALSE);

if (A_FAILED(status)) {
if (status) {
if (pDev->HifAttached) {
HIFDetachHTC(pDev->HIFDevice);
pDev->HifAttached = FALSE;
Expand Down Expand Up @@ -343,7 +343,7 @@ static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacke

AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDoEnableDisableRecvAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev));

if (A_FAILED(pPacket->Status)) {
if (pPacket->Status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
(" Failed to disable receiver, status:%d \n", pPacket->Status));
}
Expand Down Expand Up @@ -393,7 +393,7 @@ static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, A_BOOL EnableRecv,

} while (FALSE);

if (A_FAILED(status) && (pIOPacket != NULL)) {
if (status && (pIOPacket != NULL)) {
AR6KFreeIOPacket(pDev,pIOPacket);
}

Expand Down Expand Up @@ -462,7 +462,7 @@ static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_

} while (FALSE);

if (A_FAILED(status) && (pIOPacket != NULL)) {
if (status && (pIOPacket != NULL)) {
AR6KFreeIOPacket(pDev,pIOPacket);
}

Expand Down Expand Up @@ -510,7 +510,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE *pDev,A_UINT32 TimeoutInMs,A_BOOL *pbIsRec
sizeof(A_UCHAR),
HIF_RD_SYNC_BYTE_INC,
NULL);
if(A_FAILED(status))
if(status)
{
AR_DEBUG_PRINTF(ATH_LOG_ERR,("DevWaitForPendingRecv:Read HOST_INT_STATUS_ADDRESS Failed 0x%X\n",status));
break;
Expand Down Expand Up @@ -721,7 +721,7 @@ static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq)

} while (FALSE);

if ((status != A_PENDING) && A_FAILED(status) && (request & HIF_ASYNCHRONOUS)) {
if ((status != A_PENDING) && status && (request & HIF_ASYNCHRONOUS)) {
if (pIOPacket != NULL) {
AR6KFreeIOPacket(pDev,pIOPacket);
}
Expand Down Expand Up @@ -790,7 +790,7 @@ static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev)
DevFreeScatterReq((HIF_DEVICE *)pDev,pReq);
}

if (A_FAILED(status)) {
if (status) {
DevCleanupVirtualScatterSupport(pDev);
} else {
pDev->HifScatterInfo.pAllocateReqFunc = DevAllocScatterReq;
Expand Down Expand Up @@ -825,7 +825,7 @@ int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer)
&pDev->HifScatterInfo,
sizeof(pDev->HifScatterInfo));

if (A_FAILED(status)) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_WARN,
("AR6K: ** HIF layer does not support scatter requests (%d) \n",status));

Expand Down Expand Up @@ -919,7 +919,7 @@ int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, A_B

status = DEV_PREPARE_SCATTER_OPERATION(pScatterReq);

if (A_FAILED(status)) {
if (status) {
if (Async) {
pScatterReq->CompletionStatus = status;
pScatterReq->CompletionRoutine(pScatterReq);
Expand Down
24 changes: 12 additions & 12 deletions trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ int DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
&events,
NULL);
if (A_FAILED(status))
if (status)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to get pending events \n"));
break;
Expand All @@ -109,7 +109,7 @@ int DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
HIF_RD_SYNC_BYTE_INC,
NULL);

if (A_FAILED(status)){
if (status){
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to read register table \n"));
break;
}
Expand Down Expand Up @@ -310,7 +310,7 @@ static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)

do {

if (A_FAILED(pPacket->Status)) {
if (pPacket->Status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
(" GetEvents I/O request failed, status:%d \n", pPacket->Status));
/* bail out, don't unmask HIF interrupt */
Expand Down Expand Up @@ -501,7 +501,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncPr
&events,
NULL);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand Down Expand Up @@ -550,7 +550,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncPr
HIF_RD_SYNC_BYTE_INC,
NULL);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand Down Expand Up @@ -597,7 +597,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncPr
do {

/* did the interrupt status fetches succeed? */
if (A_FAILED(status)) {
if (status) {
break;
}

Expand All @@ -617,7 +617,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncPr
* completion routine of the callers read request. This can improve performance
* by reducing context switching when we rapidly pull packets */
status = pDev->MessagePendingCallback(pDev->HTCContext, &lookAhead, 1, pASyncProcessing, &fetched);
if (A_FAILED(status)) {
if (status) {
break;
}

Expand All @@ -637,23 +637,23 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncPr
if (HOST_INT_STATUS_CPU_GET(host_int_status)) {
/* CPU Interrupt */
status = DevServiceCPUInterrupt(pDev);
if (A_FAILED(status)){
if (status){
break;
}
}

if (HOST_INT_STATUS_ERROR_GET(host_int_status)) {
/* Error Interrupt */
status = DevServiceErrorInterrupt(pDev);
if (A_FAILED(status)){
if (status){
break;
}
}

if (HOST_INT_STATUS_COUNTER_GET(host_int_status)) {
/* Counter Interrupt */
status = DevServiceCounterInterrupt(pDev);
if (A_FAILED(status)){
if (status){
break;
}
}
Expand Down Expand Up @@ -697,7 +697,7 @@ int DevDsrHandler(void *context)

while (!done) {
status = ProcessPendingIRQs(pDev, &done, &asyncProc);
if (A_FAILED(status)) {
if (status) {
break;
}

Expand Down Expand Up @@ -763,7 +763,7 @@ void DumpAR6KDevState(AR6K_DEVICE *pDev)
HIF_RD_SYNC_BYTE_INC,
NULL);

if (A_FAILED(status)) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("DumpAR6KDevState : Failed to read register table (%d) \n",status));
return;
Expand Down
28 changes: 14 additions & 14 deletions trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket)

AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxIRQActionAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev));

if (A_FAILED(pPacket->Status)) {
if (pPacket->Status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("IRQAction Operation (%d) failed! status:%d \n", pPacket->PktInfo.AsRx.HTCRxFlags,pPacket->Status));
}
Expand Down Expand Up @@ -137,7 +137,7 @@ static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE
NULL);
} while (FALSE);

if (A_FAILED(status)) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
(" IRQAction Operation (%d) failed! status:%d \n", IrqAction, status));
} else {
Expand Down Expand Up @@ -244,7 +244,7 @@ int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, A_BOOL

} while (FALSE);

if (A_FAILED(status)) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
(" IRQAction Operation (%d) failed! status:%d \n", IrqAction, status));
} else {
Expand Down Expand Up @@ -285,7 +285,7 @@ int DevSetupGMbox(AR6K_DEVICE *pDev)

status = DevGMboxIRQAction(pDev, GMBOX_DISABLE_ALL, PROC_IO_SYNC);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand All @@ -305,13 +305,13 @@ int DevSetupGMbox(AR6K_DEVICE *pDev)
HIF_WR_SYNC_BYTE_FIX, /* hit this register 4 times */
NULL);

if (A_FAILED(status)) {
if (status) {
break;
}

status = GMboxProtocolInstall(pDev);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand Down Expand Up @@ -348,7 +348,7 @@ int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev)
status = A_ECOMM;
}

if (A_FAILED(status)) {
if (status) {
if (pDev->GMboxInfo.pTargetFailureCallback != NULL) {
pDev->GMboxInfo.pTargetFailureCallback(pDev->GMboxInfo.pProtocolContext, status);
}
Expand All @@ -365,7 +365,7 @@ int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev)
}
}

if (A_FAILED(status)) {
if (status) {
break;
}

Expand All @@ -378,7 +378,7 @@ int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev)
/* do synchronous read */
status = DevGMboxReadCreditCounter(pDev, PROC_IO_SYNC, &credits);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand Down Expand Up @@ -522,7 +522,7 @@ static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket)

AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxReadCreditsAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev));

if (A_FAILED(pPacket->Status)) {
if (pPacket->Status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("Read Credit Operation failed! status:%d \n", pPacket->Status));
} else {
Expand Down Expand Up @@ -583,7 +583,7 @@ int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, A_BOOL AsyncMode, int *pCredits
NULL);
} while (FALSE);

if (A_FAILED(status)) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
(" DevGMboxReadCreditCounter failed! status:%d \n", status));
}
Expand Down Expand Up @@ -659,7 +659,7 @@ int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, A_UINT8 *pLookAheadBuffer, int
HIF_RD_SYNC_BYTE_INC,
NULL);

if (A_FAILED(status)) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("DevGMboxRecvLookAheadPeek : Failed to read register table (%d) \n",status));
break;
Expand Down Expand Up @@ -701,7 +701,7 @@ int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int Signal, int AckTimeoutMS)
HIF_WR_SYNC_BYTE_FIX, /* hit the register 4 times to align the I/O */
NULL);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand All @@ -718,7 +718,7 @@ int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int Signal, int AckTimeoutMS)
HIF_RD_SYNC_BYTE_FIX,
NULL);

if (A_FAILED(status)) {
if (status) {
break;
}

Expand Down
Loading

0 comments on commit eb44cf9

Please sign in to comment.