Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05209262 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

staging: ath6kl: s|A_MEMCPY|memcpy|g 



for i in $(find ./drivers/staging/ath6kl/ -name \*.[ch]) ; do \
        sed -r -i -e "s/A_MEMCPY/memcpy/g" $i; done

Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7702c360

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

+37 −37
Original line number Diff line number Diff line
@@ -231,11 +231,11 @@ BMIReadMemory(HIF_DEVICE *device, 
    {

        rxlen = (remaining < BMI_DATASZ_MAX) ? remaining : BMI_DATASZ_MAX;

        offset = 0;

        A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

        memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

        offset += sizeof(cid);

        A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));

        memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));

        offset += sizeof(address);

        A_MEMCPY(&(pBMICmdBuf[offset]), &rxlen, sizeof(rxlen));

        memcpy(&(pBMICmdBuf[offset]), &rxlen, sizeof(rxlen));

        offset += sizeof(length);



        status = bmiBufferSend(device, pBMICmdBuf, offset);
@@ -248,7 +248,7 @@ BMIReadMemory(HIF_DEVICE *device, 
            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));

            return A_ERROR;

        }

        A_MEMCPY(&buffer[length - remaining], pBMICmdBuf, rxlen);

        memcpy(&buffer[length - remaining], pBMICmdBuf, rxlen);

        remaining -= rxlen; address += rxlen;

    }
@@ -300,13 +300,13 @@ BMIWriteMemory(HIF_DEVICE *device, 
            txlen = (BMI_DATASZ_MAX - header);

        }

        offset = 0;

        A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

        memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

        offset += sizeof(cid);

        A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));

        memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));

        offset += sizeof(address);

        A_MEMCPY(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));

        memcpy(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));

        offset += sizeof(txlen);

        A_MEMCPY(&(pBMICmdBuf[offset]), src, txlen);

        memcpy(&(pBMICmdBuf[offset]), src, txlen);

        offset += txlen;

        status = bmiBufferSend(device, pBMICmdBuf, offset);

        if (status) {
@@ -345,11 +345,11 @@ BMIExecute(HIF_DEVICE *device, 
    cid = BMI_EXECUTE;



    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));

    memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));

    offset += sizeof(address);

    A_MEMCPY(&(pBMICmdBuf[offset]), param, sizeof(*param));

    memcpy(&(pBMICmdBuf[offset]), param, sizeof(*param));

    offset += sizeof(*param);

    status = bmiBufferSend(device, pBMICmdBuf, offset);

    if (status) {
@@ -363,7 +363,7 @@ BMIExecute(HIF_DEVICE *device, 
        return A_ERROR;

    }



    A_MEMCPY(param, pBMICmdBuf, sizeof(*param));

    memcpy(param, pBMICmdBuf, sizeof(*param));



    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Execute: Exit (param: %d)\n", *param));

    return 0;
@@ -392,9 +392,9 @@ BMISetAppStart(HIF_DEVICE *device, 
    cid = BMI_SET_APP_START;



    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));

    memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));

    offset += sizeof(address);

    status = bmiBufferSend(device, pBMICmdBuf, offset);

    if (status) {
@@ -430,9 +430,9 @@ BMIReadSOCRegister(HIF_DEVICE *device, 
    cid = BMI_READ_SOC_REGISTER;



    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));

    memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));

    offset += sizeof(address);



    status = bmiBufferSend(device, pBMICmdBuf, offset);
@@ -446,7 +446,7 @@ BMIReadSOCRegister(HIF_DEVICE *device, 
        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));

        return A_ERROR;

    }

    A_MEMCPY(param, pBMICmdBuf, sizeof(*param));

    memcpy(param, pBMICmdBuf, sizeof(*param));



    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit (value: %d)\n", *param));

    return 0;
@@ -476,11 +476,11 @@ BMIWriteSOCRegister(HIF_DEVICE *device, 
    cid = BMI_WRITE_SOC_REGISTER;



    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));

    memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));

    offset += sizeof(address);

    A_MEMCPY(&(pBMICmdBuf[offset]), &param, sizeof(param));

    memcpy(&(pBMICmdBuf[offset]), &param, sizeof(param));

    offset += sizeof(param);

    status = bmiBufferSend(device, pBMICmdBuf, offset);

    if (status) {
@@ -521,15 +521,15 @@ BMIrompatchInstall(HIF_DEVICE *device, 
    cid = BMI_ROMPATCH_INSTALL;



    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &ROM_addr, sizeof(ROM_addr));

    memcpy(&(pBMICmdBuf[offset]), &ROM_addr, sizeof(ROM_addr));

    offset += sizeof(ROM_addr);

    A_MEMCPY(&(pBMICmdBuf[offset]), &RAM_addr, sizeof(RAM_addr));

    memcpy(&(pBMICmdBuf[offset]), &RAM_addr, sizeof(RAM_addr));

    offset += sizeof(RAM_addr);

    A_MEMCPY(&(pBMICmdBuf[offset]), &nbytes, sizeof(nbytes));

    memcpy(&(pBMICmdBuf[offset]), &nbytes, sizeof(nbytes));

    offset += sizeof(nbytes);

    A_MEMCPY(&(pBMICmdBuf[offset]), &do_activate, sizeof(do_activate));

    memcpy(&(pBMICmdBuf[offset]), &do_activate, sizeof(do_activate));

    offset += sizeof(do_activate);

    status = bmiBufferSend(device, pBMICmdBuf, offset);

    if (status) {
@@ -542,7 +542,7 @@ BMIrompatchInstall(HIF_DEVICE *device, 
        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));

        return A_ERROR;

    }

    A_MEMCPY(rompatch_id, pBMICmdBuf, sizeof(*rompatch_id));

    memcpy(rompatch_id, pBMICmdBuf, sizeof(*rompatch_id));



    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch Install: (rompatch_id=%d)\n", *rompatch_id));

    return 0;
@@ -571,9 +571,9 @@ BMIrompatchUninstall(HIF_DEVICE *device, 
    cid = BMI_ROMPATCH_UNINSTALL;



    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &rompatch_id, sizeof(rompatch_id));

    memcpy(&(pBMICmdBuf[offset]), &rompatch_id, sizeof(rompatch_id));

    offset += sizeof(rompatch_id);

    status = bmiBufferSend(device, pBMICmdBuf, offset);

    if (status) {
@@ -611,12 +611,12 @@ _BMIrompatchChangeActivation(HIF_DEVICE *device, 
    cid = do_activate ? BMI_ROMPATCH_ACTIVATE : BMI_ROMPATCH_DEACTIVATE;



    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &rompatch_count, sizeof(rompatch_count));

    memcpy(&(pBMICmdBuf[offset]), &rompatch_count, sizeof(rompatch_count));

    offset += sizeof(rompatch_count);

    length = rompatch_count * sizeof(*rompatch_list);

    A_MEMCPY(&(pBMICmdBuf[offset]), rompatch_list, length);

    memcpy(&(pBMICmdBuf[offset]), rompatch_list, length);

    offset += length;

    status = bmiBufferSend(device, pBMICmdBuf, offset);

    if (status) {
@@ -676,11 +676,11 @@ BMILZData(HIF_DEVICE *device, 
        txlen = (remaining < (BMI_DATASZ_MAX - header)) ?

                                       remaining : (BMI_DATASZ_MAX - header);

        offset = 0;

        A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

        memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

        offset += sizeof(cid);

        A_MEMCPY(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));

        memcpy(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));

        offset += sizeof(txlen);

        A_MEMCPY(&(pBMICmdBuf[offset]), &buffer[length - remaining], txlen);

        memcpy(&(pBMICmdBuf[offset]), &buffer[length - remaining], txlen);

        offset += txlen;

        status = bmiBufferSend(device, pBMICmdBuf, offset);

        if (status) {
@@ -717,9 +717,9 @@ BMILZStreamStart(HIF_DEVICE *device, 


    cid = BMI_LZ_STREAM_START;

    offset = 0;

    A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));

    offset += sizeof(cid);

    A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));

    memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));

    offset += sizeof(address);

    status = bmiBufferSend(device, pBMICmdBuf, offset);

    if (status) {
@@ -972,7 +972,7 @@ BMIFastDownload(HIF_DEVICE *device, u32 address, A_UCHAR *buffer, u32 length) 


    if (unalignedBytes) {

            /* copy the last word into a zero padded buffer */

        A_MEMCPY(&lastWord, &buffer[lastWordOffset], unalignedBytes);

        memcpy(&lastWord, &buffer[lastWordOffset], unalignedBytes);

    }



    status = BMILZData(device, buffer, lastWordOffset);

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

+6 −6
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int DevEnableInterrupts(AR6K_DEVICE *pDev) 
        COUNTER_INT_STATUS_ENABLE_BIT_SET(AR6K_TARGET_DEBUG_INTR_MASK);



        /* copy into our temp area */

    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

    memcpy(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);



    UNLOCK_AR6K(pDev);
@@ -287,7 +287,7 @@ int DevDisableInterrupts(AR6K_DEVICE *pDev) 
    pDev->IrqEnableRegisters.error_status_enable = 0;

    pDev->IrqEnableRegisters.counter_int_status_enable = 0;

        /* copy into our temp area */

    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

    memcpy(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);



    UNLOCK_AR6K(pDev);
@@ -419,7 +419,7 @@ static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool 
    }



        /* copy into our temp area */

    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

    memcpy(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

    UNLOCK_AR6K(pDev);



    do {
@@ -435,7 +435,7 @@ static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool 
            }



                /* copy values to write to our async I/O buffer */

            A_MEMCPY(pIOPacket->pBuffer,&regs,AR6K_IRQ_ENABLE_REGS_SIZE);

            memcpy(pIOPacket->pBuffer,&regs,AR6K_IRQ_ENABLE_REGS_SIZE);



                /* stick in our completion routine when the I/O operation completes */

            pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
@@ -635,10 +635,10 @@ int DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, bool FromDMA) 


        if (FromDMA) {

                /* from DMA buffer */

            A_MEMCPY(pReq->ScatterList[i].pBuffer, pDMABuffer , length);

            memcpy(pReq->ScatterList[i].pBuffer, pDMABuffer , length);

        } else {

                /* to DMA buffer */

            A_MEMCPY(pDMABuffer, pReq->ScatterList[i].pBuffer, length);

            memcpy(pDMABuffer, pReq->ScatterList[i].pBuffer, length);

        }



        pDMABuffer += length;

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

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ void DumpAR6KDevState(AR6K_DEVICE *pDev) 


    LOCK_AR6K(pDev);

        /* copy into our temp area */

    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

    memcpy(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

    UNLOCK_AR6K(pDev);



        /* load the register table from the device */

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

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE 
            ~(COUNTER_INT_STATUS_ENABLE_BIT_SET(1 << AR6K_GMBOX_CREDIT_COUNTER));    

    }

        /* copy into our temp area */

    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

    memcpy(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);



    UNLOCK_AR6K(pDev);
@@ -110,7 +110,7 @@ static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE 
            }



                /* copy values to write to our async I/O buffer */

            A_MEMCPY(pIOPacket->pBuffer,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);

            memcpy(pIOPacket->pBuffer,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);



                /* stick in our completion routine when the I/O operation completes */

            pIOPacket->Completion = DevGMboxIRQActionAsyncHandler;
@@ -216,7 +216,7 @@ int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool A 
            }



                /* copy values to write to our async I/O buffer */

            A_MEMCPY(pIOPacket->pBuffer,GMboxIntControl,sizeof(GMboxIntControl));

            memcpy(pIOPacket->pBuffer,GMboxIntControl,sizeof(GMboxIntControl));



                /* stick in our completion routine when the I/O operation completes */

            pIOPacket->Completion = DevGMboxIRQActionAsyncHandler;
@@ -667,7 +667,7 @@ int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLoo 
        

        if (procRegs.gmbox_rx_avail > 0) {

            int bytes = procRegs.gmbox_rx_avail > maxCopy ? maxCopy : procRegs.gmbox_rx_avail;

            A_MEMCPY(pLookAheadBuffer,&procRegs.rx_gmbox_lookahead_alias[0],bytes);

            memcpy(pLookAheadBuffer,&procRegs.rx_gmbox_lookahead_alias[0],bytes);

            *pLookAheadBytes = bytes;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_I 
            break;    

        }

        

        A_MEMCPY(&pProtocol->HCIConfig, pInfo, sizeof(HCI_TRANSPORT_CONFIG_INFO));

        memcpy(&pProtocol->HCIConfig, pInfo, sizeof(HCI_TRANSPORT_CONFIG_INFO));

        

        A_ASSERT(pProtocol->HCIConfig.pHCIPktRecv != NULL);

        A_ASSERT(pProtocol->HCIConfig.pHCISendComplete != NULL);