diff options
Diffstat (limited to 'drivers/staging/ath6kl/htc2/AR6000/ar6k.c')
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c index ed51a8da965..6083231cdbb 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c | |||
@@ -77,7 +77,7 @@ void DevCleanup(AR6K_DEVICE *pDev) | |||
77 | int DevSetup(AR6K_DEVICE *pDev) | 77 | int DevSetup(AR6K_DEVICE *pDev) |
78 | { | 78 | { |
79 | u32 blocksizes[AR6K_MAILBOXES]; | 79 | u32 blocksizes[AR6K_MAILBOXES]; |
80 | int status = A_OK; | 80 | int status = 0; |
81 | int i; | 81 | int i; |
82 | HTC_CALLBACKS htcCallbacks; | 82 | HTC_CALLBACKS htcCallbacks; |
83 | 83 | ||
@@ -309,7 +309,7 @@ int DevUnmaskInterrupts(AR6K_DEVICE *pDev) | |||
309 | * and when HTC is finally ready to handle interrupts, other software can perform target "soft" resets. | 309 | * and when HTC is finally ready to handle interrupts, other software can perform target "soft" resets. |
310 | * The AR6K interrupt enables reset back to an "enabled" state when this happens. | 310 | * The AR6K interrupt enables reset back to an "enabled" state when this happens. |
311 | * */ | 311 | * */ |
312 | int IntStatus = A_OK; | 312 | int IntStatus = 0; |
313 | DevDisableInterrupts(pDev); | 313 | DevDisableInterrupts(pDev); |
314 | 314 | ||
315 | #ifdef THREAD_X | 315 | #ifdef THREAD_X |
@@ -357,7 +357,7 @@ static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacke | |||
357 | * disable recv events */ | 357 | * disable recv events */ |
358 | static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode) | 358 | static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode) |
359 | { | 359 | { |
360 | int status = A_OK; | 360 | int status = 0; |
361 | HTC_PACKET *pIOPacket = NULL; | 361 | HTC_PACKET *pIOPacket = NULL; |
362 | 362 | ||
363 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n", | 363 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n", |
@@ -405,7 +405,7 @@ static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, bool EnableRecv, bo | |||
405 | * the host I/F */ | 405 | * the host I/F */ |
406 | static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode) | 406 | static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode) |
407 | { | 407 | { |
408 | int status = A_OK; | 408 | int status = 0; |
409 | HTC_PACKET *pIOPacket = NULL; | 409 | HTC_PACKET *pIOPacket = NULL; |
410 | AR6K_IRQ_ENABLE_REGISTERS regs; | 410 | AR6K_IRQ_ENABLE_REGISTERS regs; |
411 | 411 | ||
@@ -490,7 +490,7 @@ int DevEnableRecv(AR6K_DEVICE *pDev, bool AsyncMode) | |||
490 | 490 | ||
491 | int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPending) | 491 | int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPending) |
492 | { | 492 | { |
493 | int status = A_OK; | 493 | int status = 0; |
494 | A_UCHAR host_int_status = 0x0; | 494 | A_UCHAR host_int_status = 0x0; |
495 | u32 counter = 0x0; | 495 | u32 counter = 0x0; |
496 | 496 | ||
@@ -519,7 +519,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPendin | |||
519 | host_int_status = !status ? (host_int_status & (1 << 0)):0; | 519 | host_int_status = !status ? (host_int_status & (1 << 0)):0; |
520 | if(!host_int_status) | 520 | if(!host_int_status) |
521 | { | 521 | { |
522 | status = A_OK; | 522 | status = 0; |
523 | *pbIsRecvPending = false; | 523 | *pbIsRecvPending = false; |
524 | break; | 524 | break; |
525 | } | 525 | } |
@@ -645,7 +645,7 @@ int DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, bool FromDMA) | |||
645 | remaining -= length; | 645 | remaining -= length; |
646 | } | 646 | } |
647 | 647 | ||
648 | return A_OK; | 648 | return 0; |
649 | } | 649 | } |
650 | 650 | ||
651 | static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket) | 651 | static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket) |
@@ -667,7 +667,7 @@ static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket) | |||
667 | static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) | 667 | static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) |
668 | { | 668 | { |
669 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 669 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; |
670 | int status = A_OK; | 670 | int status = 0; |
671 | HTC_PACKET *pIOPacket = NULL; | 671 | HTC_PACKET *pIOPacket = NULL; |
672 | u32 request = pReq->Request; | 672 | u32 request = pReq->Request; |
673 | 673 | ||
@@ -727,7 +727,7 @@ static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) | |||
727 | } | 727 | } |
728 | pReq->CompletionStatus = status; | 728 | pReq->CompletionStatus = status; |
729 | pReq->CompletionRoutine(pReq); | 729 | pReq->CompletionRoutine(pReq); |
730 | status = A_OK; | 730 | status = 0; |
731 | } | 731 | } |
732 | 732 | ||
733 | return status; | 733 | return status; |
@@ -751,7 +751,7 @@ static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev) | |||
751 | /* function to set up virtual scatter support if HIF layer has not implemented the interface */ | 751 | /* function to set up virtual scatter support if HIF layer has not implemented the interface */ |
752 | static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev) | 752 | static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev) |
753 | { | 753 | { |
754 | int status = A_OK; | 754 | int status = 0; |
755 | int bufferSize, sgreqSize; | 755 | int bufferSize, sgreqSize; |
756 | int i; | 756 | int i; |
757 | DEV_SCATTER_DMA_VIRTUAL_INFO *pVirtualInfo; | 757 | DEV_SCATTER_DMA_VIRTUAL_INFO *pVirtualInfo; |
@@ -923,7 +923,7 @@ int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, boo | |||
923 | if (Async) { | 923 | if (Async) { |
924 | pScatterReq->CompletionStatus = status; | 924 | pScatterReq->CompletionStatus = status; |
925 | pScatterReq->CompletionRoutine(pScatterReq); | 925 | pScatterReq->CompletionRoutine(pScatterReq); |
926 | return A_OK; | 926 | return 0; |
927 | } | 927 | } |
928 | return status; | 928 | return status; |
929 | } | 929 | } |
@@ -936,7 +936,7 @@ int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, boo | |||
936 | DEV_FINISH_SCATTER_OPERATION(pScatterReq); | 936 | DEV_FINISH_SCATTER_OPERATION(pScatterReq); |
937 | } else { | 937 | } else { |
938 | if (status == A_PENDING) { | 938 | if (status == A_PENDING) { |
939 | status = A_OK; | 939 | status = 0; |
940 | } | 940 | } |
941 | } | 941 | } |
942 | 942 | ||
@@ -1127,7 +1127,7 @@ static u16 GetEndMarker(void) | |||
1127 | /* send the ordered buffers to the target */ | 1127 | /* send the ordered buffers to the target */ |
1128 | static int SendBuffers(AR6K_DEVICE *pDev, int mbox) | 1128 | static int SendBuffers(AR6K_DEVICE *pDev, int mbox) |
1129 | { | 1129 | { |
1130 | int status = A_OK; | 1130 | int status = 0; |
1131 | u32 request = HIF_WR_SYNC_BLOCK_INC; | 1131 | u32 request = HIF_WR_SYNC_BLOCK_INC; |
1132 | BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH]; | 1132 | BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH]; |
1133 | int i; | 1133 | int i; |
@@ -1171,7 +1171,7 @@ static int SendBuffers(AR6K_DEVICE *pDev, int mbox) | |||
1171 | /* poll the mailbox credit counter until we get a credit or timeout */ | 1171 | /* poll the mailbox credit counter until we get a credit or timeout */ |
1172 | static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) | 1172 | static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) |
1173 | { | 1173 | { |
1174 | int status = A_OK; | 1174 | int status = 0; |
1175 | int timeout = TEST_CREDITS_RECV_TIMEOUT; | 1175 | int timeout = TEST_CREDITS_RECV_TIMEOUT; |
1176 | u8 credits = 0; | 1176 | u8 credits = 0; |
1177 | u32 address; | 1177 | u32 address; |
@@ -1207,7 +1207,7 @@ static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) | |||
1207 | 1207 | ||
1208 | } | 1208 | } |
1209 | 1209 | ||
1210 | if (status == A_OK) { | 1210 | if (status == 0) { |
1211 | *pCredits = credits; | 1211 | *pCredits = credits; |
1212 | } | 1212 | } |
1213 | 1213 | ||
@@ -1218,7 +1218,7 @@ static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) | |||
1218 | /* wait for the buffers to come back */ | 1218 | /* wait for the buffers to come back */ |
1219 | static int RecvBuffers(AR6K_DEVICE *pDev, int mbox) | 1219 | static int RecvBuffers(AR6K_DEVICE *pDev, int mbox) |
1220 | { | 1220 | { |
1221 | int status = A_OK; | 1221 | int status = 0; |
1222 | u32 request = HIF_RD_SYNC_BLOCK_INC; | 1222 | u32 request = HIF_RD_SYNC_BLOCK_INC; |
1223 | BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH]; | 1223 | BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH]; |
1224 | int curBuffer; | 1224 | int curBuffer; |
@@ -1457,7 +1457,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev) | |||
1457 | 1457 | ||
1458 | } while (false); | 1458 | } while (false); |
1459 | 1459 | ||
1460 | if (status == A_OK) { | 1460 | if (status == 0) { |
1461 | AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - SUCCESS! - \n")); | 1461 | AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - SUCCESS! - \n")); |
1462 | } else { | 1462 | } else { |
1463 | AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - FAILED! - \n")); | 1463 | AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - FAILED! - \n")); |