Commit 391bb211 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: ath6kl: Remove A_FAILED macro 



Remove obfuscating A_FAILED(foo) macro.
Just test for foo instead.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarVipin Mehta <vipin.mehta@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 509c9d97

drivers/staging/ath6kl/bmi/src/bmi.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

    }
@@ -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;

    }
@@ -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;

        }

    }

drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c

+3 −3
Original line number Diff line number Diff line
@@ -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));        

    }
@@ -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;
@@ -348,7 +348,7 @@ int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO * 
        

    } while (FALSE);

    

    if (A_FAILED(status)) {

    if (status) {

        CleanupHIFScatterResources(device);   

    }

drivers/staging/ath6kl/htc2/AR6000/ar6k.c

+11 −11
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int DevSetup(AR6K_DEVICE *pDev) 


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



        if (A_FAILED(status)) {

        if (status) {

            break;

        }
@@ -197,7 +197,7 @@ int DevSetup(AR6K_DEVICE *pDev) 


        status = DevDisableInterrupts(pDev);



        if (A_FAILED(status)) {

        if (status) {

            break;

        }
@@ -205,7 +205,7 @@ int DevSetup(AR6K_DEVICE *pDev) 


    } while (FALSE);



    if (A_FAILED(status)) {

    if (status) {

        if (pDev->HifAttached) {

            HIFDetachHTC(pDev->HIFDevice);

            pDev->HifAttached = FALSE;
@@ -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));

    }
@@ -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);

    }
@@ -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);

    }
@@ -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;
@@ -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);

        }
@@ -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;
@@ -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));
@@ -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);

drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c

+12 −12
Original line number Diff line number Diff line
@@ -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;
@@ -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;

            }
@@ -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 */
@@ -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;

            }
@@ -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;

        }
@@ -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;

        }
@@ -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;

            }
@@ -637,7 +637,7 @@ 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;

            }

        }
@@ -645,7 +645,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncPr 
        if (HOST_INT_STATUS_ERROR_GET(host_int_status)) {

                /* Error Interrupt */

            status = DevServiceErrorInterrupt(pDev);

            if (A_FAILED(status)){

            if (status){

                break;

            }

        }
@@ -653,7 +653,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncPr 
        if (HOST_INT_STATUS_COUNTER_GET(host_int_status)) {

                /* Counter Interrupt */

            status = DevServiceCounterInterrupt(pDev);

            if (A_FAILED(status)){

            if (status){

                break;

            }

        }
@@ -697,7 +697,7 @@ int DevDsrHandler(void *context) 


    while (!done) {

        status = ProcessPendingIRQs(pDev, &done, &asyncProc);

        if (A_FAILED(status)) {

        if (status) {

            break;

        }
@@ -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;