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

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

staging: ath6kl: remove-typedef: A_UCHAR 

remove-typedef -s A_UCHAR u8 drivers/staging/ath6kl/

This uses the remove-typedef utility:

http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/remove-typedef



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 395e1cae

drivers/staging/ath6kl/bmi/include/bmi_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ static bool bmiDone; 


int

bmiBufferSend(HIF_DEVICE *device,

              A_UCHAR *buffer,

              u8 *buffer,

              u32 length);



int

bmiBufferReceive(HIF_DEVICE *device,

                 A_UCHAR *buffer,

                 u8 *buffer,

                 u32 length,

                 bool want_timeout);

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

+17 −17
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ very simple. 


static bool pendingEventsFuncCheck = false;

static u32 *pBMICmdCredits;

static A_UCHAR *pBMICmdBuf;

static u8 *pBMICmdBuf;

#define MAX_BMI_CMDBUF_SZ (BMI_DATASZ_MAX + \

                       sizeof(u32) /* cmd */ + \

                       sizeof(u32) /* addr */ + \
@@ -84,7 +84,7 @@ BMIInit(void) 
    }



    if (!pBMICmdBuf) {

        pBMICmdBuf = (A_UCHAR *)A_MALLOC_NOWAIT(MAX_BMI_CMDBUF_SZ);

        pBMICmdBuf = (u8 *)A_MALLOC_NOWAIT(MAX_BMI_CMDBUF_SZ);

        A_ASSERT(pBMICmdBuf);

    }
@@ -120,7 +120,7 @@ BMIDone(HIF_DEVICE *device) 
    bmiDone = true;

    cid = BMI_DONE;



    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));

    status = bmiBufferSend(device, (u8 *)&cid, sizeof(cid));

    if (status) {

        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));

        return A_ERROR;
@@ -155,13 +155,13 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info) 
    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Enter (device: 0x%p)\n", device));

    cid = BMI_GET_TARGET_INFO;



    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));

    status = bmiBufferSend(device, (u8 *)&cid, sizeof(cid));

    if (status) {

        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));

        return A_ERROR;

    }



    status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_ver,

    status = bmiBufferReceive(device, (u8 *)&targ_info->target_ver,

                                                sizeof(targ_info->target_ver), true);

    if (status) {

        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Version from the device\n"));
@@ -170,7 +170,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,

        status = bmiBufferReceive(device, (u8 *)&targ_info->target_info_byte_count,

                                            sizeof(targ_info->target_info_byte_count), true);

        if (status) {

            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info Byte Count from the device\n"));
@@ -185,7 +185,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),

                        ((u8 *)targ_info)+sizeof(targ_info->target_info_byte_count),

                        sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count), true);

        if (status) {

            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info (%d bytes) from the device\n",
@@ -203,7 +203,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info) 
int

BMIReadMemory(HIF_DEVICE *device,

              u32 address,

              A_UCHAR *buffer,

              u8 *buffer,

              u32 length)

{

    u32 cid;
@@ -259,7 +259,7 @@ BMIReadMemory(HIF_DEVICE *device, 
int

BMIWriteMemory(HIF_DEVICE *device,

               u32 address,

               A_UCHAR *buffer,

               u8 *buffer,

               u32 length)

{

    u32 cid;
@@ -267,8 +267,8 @@ BMIWriteMemory(HIF_DEVICE *device, 
    u32 offset;

    u32 remaining, txlen;

    const u32 header = sizeof(cid) + sizeof(address) + sizeof(length);

    A_UCHAR alignedBuffer[BMI_DATASZ_MAX];

    A_UCHAR *src;

    u8 alignedBuffer[BMI_DATASZ_MAX];

    u8 *src;



    A_ASSERT(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header));

    memset (pBMICmdBuf, 0, BMI_DATASZ_MAX + header);
@@ -647,7 +647,7 @@ BMIrompatchDeactivate(HIF_DEVICE *device, 


int

BMILZData(HIF_DEVICE *device,

          A_UCHAR *buffer,

          u8 *buffer,

          u32 length)

{

    u32 cid;
@@ -735,7 +735,7 @@ BMILZStreamStart(HIF_DEVICE *device, 
/* BMI Access routines */

int

bmiBufferSend(HIF_DEVICE *device,

              A_UCHAR *buffer,

              u8 *buffer,

              u32 length)

{

    int status;
@@ -783,7 +783,7 @@ bmiBufferSend(HIF_DEVICE *device, 


int

bmiBufferReceive(HIF_DEVICE *device,

                 A_UCHAR *buffer,

                 u8 *buffer,

                 u32 length,

                 bool want_timeout)

{
@@ -958,7 +958,7 @@ bmiBufferReceive(HIF_DEVICE *device, 
}



int

BMIFastDownload(HIF_DEVICE *device, u32 address, A_UCHAR *buffer, u32 length)

BMIFastDownload(HIF_DEVICE *device, u32 address, u8 *buffer, u32 length)

{

    int status = A_ERROR;

    u32 lastWord = 0;
@@ -998,13 +998,13 @@ BMIFastDownload(HIF_DEVICE *device, u32 address, A_UCHAR *buffer, u32 length) 
}



int

BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, u32 length)

BMIRawWrite(HIF_DEVICE *device, u8 *buffer, u32 length)

{

    return bmiBufferSend(device, buffer, length);

}



int

BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, u32 length, bool want_timeout)

BMIRawRead(HIF_DEVICE *device, u8 *buffer, u32 length, bool want_timeout)

{

    return bmiBufferReceive(device, buffer, length, want_timeout);

}

drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ typedef struct bus_request { 
    struct bus_request *inusenext;  /* link list of in use requests */

    struct semaphore sem_req;

    u32 address;               /* request data */

    A_UCHAR *buffer;

    u8 *buffer;

    u32 length;

    u32 request;

    void *context;

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

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int HIFInit(OSDRV_CALLBACKS *callbacks) 
static int

__HIFReadWrite(HIF_DEVICE *device,

             u32 address,

             A_UCHAR *buffer,

             u8 *buffer,

             u32 length,

             u32 request,

             void *context)
@@ -332,7 +332,7 @@ void AddToAsyncList(HIF_DEVICE *device, BUS_REQUEST *busrequest) 
int

HIFReadWrite(HIF_DEVICE *device,

             u32 address,

             A_UCHAR *buffer,

             u8 *buffer,

             u32 length,

             u32 request,

             void *context)

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

+2 −2
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ int DevEnableRecv(AR6K_DEVICE *pDev, bool AsyncMode) 
int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPending)

{

    int    status          = 0;

    A_UCHAR     host_int_status = 0x0;

    u8     host_int_status = 0x0;

    u32 counter         = 0x0;



    if(TimeoutInMs < 100)
@@ -507,7 +507,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPendin 
        status = HIFReadWrite(pDev->HIFDevice,

                              HOST_INT_STATUS_ADDRESS,

                             &host_int_status,

                              sizeof(A_UCHAR),

                              sizeof(u8),

                              HIF_RD_SYNC_BYTE_INC,

                              NULL);

        if (status)