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

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

ath6kl: remove-typedef HTC_PACKET 



This required two passes:

remove-typedef -s HTC_PACKET \
	"struct htc_packet" drivers/staging/ath6kl/

remove-typedef -s _HTC_PACKET \
	"struct htc_packet" drivers/staging/ath6kl/

Tested-by: default avatarNaveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4f0cce96

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

+9 −9
Original line number Diff line number Diff line
@@ -40,16 +40,16 @@ int DevDisableInterrupts(struct ar6k_device *pDev); 


static void DevCleanupVirtualScatterSupport(struct ar6k_device *pDev);



void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket)

void AR6KFreeIOPacket(struct ar6k_device *pDev, struct htc_packet *pPacket)

{

    LOCK_AR6K(pDev);

    HTC_PACKET_ENQUEUE(&pDev->RegisterIOList,pPacket);

    UNLOCK_AR6K(pDev);

}



HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev)

struct htc_packet *AR6KAllocIOPacket(struct ar6k_device *pDev)

{

    HTC_PACKET *pPacket;

    struct htc_packet *pPacket;



    LOCK_AR6K(pDev);

    pPacket = HTC_PACKET_DEQUEUE(&pDev->RegisterIOList);
@@ -113,7 +113,7 @@ int DevSetup(struct ar6k_device *pDev) 


            /* carve up register I/O packets (these are for ASYNC register I/O ) */

        for (i = 0; i < AR6K_MAX_REG_IO_BUFFERS; i++) {

            HTC_PACKET *pIOPacket;

            struct htc_packet *pIOPacket;

            pIOPacket = &pDev->RegIOBuffers[i].HtcPacket;

            SET_HTC_PACKET_INFO_RX_REFILL(pIOPacket,

                                          pDev,
@@ -337,7 +337,7 @@ int DevMaskInterrupts(struct ar6k_device *pDev) 
}



/* callback when our fetch to enable/disable completes */

static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacket)

static void DevDoEnableDisableRecvAsyncHandler(void *Context, struct htc_packet *pPacket)

{

    struct ar6k_device *pDev = (struct ar6k_device *)Context;
@@ -358,7 +358,7 @@ static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacke 
static int DevDoEnableDisableRecvOverride(struct ar6k_device *pDev, bool EnableRecv, bool AsyncMode)

{

    int                  status = 0;

    HTC_PACKET                *pIOPacket = NULL;

    struct htc_packet                *pIOPacket = NULL;



    AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n",

            EnableRecv,AsyncMode));
@@ -406,7 +406,7 @@ static int DevDoEnableDisableRecvOverride(struct ar6k_device *pDev, bool EnableR 
static int DevDoEnableDisableRecvNormal(struct ar6k_device *pDev, bool EnableRecv, bool AsyncMode)

{

    int                  status = 0;

    HTC_PACKET                *pIOPacket = NULL;

    struct htc_packet                *pIOPacket = NULL;

    struct ar6k_irq_enable_registers regs;



        /* take the lock to protect interrupt enable shadows */
@@ -648,7 +648,7 @@ int DevCopyScatterListToFromDMABuffer(struct hif_scatter_req *pReq, bool FromDMA 
    return 0;

}



static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket)

static void DevReadWriteScatterAsyncHandler(void *Context, struct htc_packet *pPacket)

{

    struct ar6k_device     *pDev = (struct ar6k_device *)Context;

    struct hif_scatter_req *pReq = (struct hif_scatter_req *)pPacket->pPktContext;
@@ -668,7 +668,7 @@ static int DevReadWriteScatter(HIF_DEVICE *Context, struct hif_scatter_req *pReq 
{

    struct ar6k_device     *pDev = (struct ar6k_device *)Context;

    int        status = 0;

    HTC_PACKET      *pIOPacket = NULL;

    struct htc_packet      *pIOPacket = NULL;

    u32 request = pReq->Request;



    do {

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

+5 −5
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ PREPACK struct ar6k_gmbox_ctrl_registers { 


/* buffers for ASYNC I/O */

struct ar6k_async_reg_io_buffer {

    HTC_PACKET    HtcPacket;   /* we use an HTC packet as a wrapper for our async register-based I/O */

    struct htc_packet    HtcPacket;   /* we use an HTC packet as a wrapper for our async register-based I/O */

    u8 _Pad1[A_CACHE_LINE_PAD];

    u8 Buffer[AR6K_REG_IO_BUFFER_SIZE];  /* cache-line safe with pads around */

    u8 _Pad2[A_CACHE_LINE_PAD];
@@ -176,7 +176,7 @@ int DevWaitForPendingRecv(struct ar6k_device *pDev,u32 TimeoutInMs,bool *pbIsRec 
#define DEV_CALC_SEND_PADDED_LEN(pDev, length) DEV_CALC_RECV_PADDED_LEN(pDev,length)

#define DEV_IS_LEN_BLOCK_ALIGNED(pDev, length) (((length) % (pDev)->BlockSize) == 0)



static INLINE int DevSendPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 SendLength) {

static INLINE int DevSendPacket(struct ar6k_device *pDev, struct htc_packet *pPacket, u32 SendLength) {

    u32 paddedLength;

    bool   sync = (pPacket->Completion == NULL) ? true : false;

    int status;
@@ -219,7 +219,7 @@ static INLINE int DevSendPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket, u 
    return status;

}

                    

static INLINE int DevRecvPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 RecvLength) {

static INLINE int DevRecvPacket(struct ar6k_device *pDev, struct htc_packet *pPacket, u32 RecvLength) {

    u32 paddedLength;

    int status;

    bool   sync = (pPacket->Completion == NULL) ? true : false;
@@ -378,8 +378,8 @@ struct ar6k_device *HTCGetAR6KDevice(void *HTCHandle); 


#define DEV_GMBOX_GET_PROTOCOL(pDev)  (pDev)->GMboxInfo.pProtocolContext



int DevGMboxWrite(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 WriteLength);

int DevGMboxRead(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 ReadLength);

int DevGMboxWrite(struct ar6k_device *pDev, struct htc_packet *pPacket, u32 WriteLength);

int DevGMboxRead(struct ar6k_device *pDev, struct htc_packet *pPacket, u32 ReadLength);



#define PROC_IO_ASYNC true

#define PROC_IO_SYNC  false

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

+5 −5
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#include "htc_packet.h"

#include "ar6k.h"



extern void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket);

extern HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev);

extern void AR6KFreeIOPacket(struct ar6k_device *pDev, struct htc_packet *pPacket);

extern struct htc_packet *AR6KAllocIOPacket(struct ar6k_device *pDev);



static int DevServiceDebugInterrupt(struct ar6k_device *pDev);
@@ -43,7 +43,7 @@ static int DevServiceDebugInterrupt(struct ar6k_device *pDev); 
/* completion routine for ALL HIF layer async I/O */

int DevRWCompletionHandler(void *context, int status)

{

    HTC_PACKET *pPacket = (HTC_PACKET *)context;

    struct htc_packet *pPacket = (struct htc_packet *)context;



    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,

                ("+DevRWCompletionHandler (Pkt:0x%lX) , Status: %d \n",
@@ -300,7 +300,7 @@ static int DevServiceCounterInterrupt(struct ar6k_device *pDev) 
}



/* callback when our fetch to get interrupt status registers completes */

static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)

static void DevGetEventAsyncHandler(void *Context, struct htc_packet *pPacket)

{

    struct ar6k_device *pDev = (struct ar6k_device *)Context;

    u32 lookAhead = 0;
@@ -392,7 +392,7 @@ int DevCheckPendingRecvMsgsAsync(void *context) 
{

    struct ar6k_device  *pDev = (struct ar6k_device *)context;

    int      status = 0;

    HTC_PACKET   *pIOPacket;

    struct htc_packet   *pIOPacket;



    /* this is called in an ASYNC only context, we may NOT block, sleep or call any apis that can

     * cause us to switch contexts */

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

+9 −9
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ 




    /* external APIs for allocating and freeing internal I/O packets to handle ASYNC I/O */ 

extern void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket);

extern HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev);

extern void AR6KFreeIOPacket(struct ar6k_device *pDev, struct htc_packet *pPacket);

extern struct htc_packet *AR6KAllocIOPacket(struct ar6k_device *pDev);





/* callback when our fetch to enable/disable completes */

static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket)

static void DevGMboxIRQActionAsyncHandler(void *Context, struct htc_packet *pPacket)

{

    struct ar6k_device *pDev = (struct ar6k_device *)Context;
@@ -78,7 +78,7 @@ static int DevGMboxCounterEnableDisable(struct ar6k_device *pDev, GMBOX_IRQ_ACTI 
{

    int                  status = 0;

    struct ar6k_irq_enable_registers regs;

    HTC_PACKET                *pIOPacket = NULL;  

    struct htc_packet                *pIOPacket = NULL;  

    

    LOCK_AR6K(pDev);
@@ -158,7 +158,7 @@ static int DevGMboxCounterEnableDisable(struct ar6k_device *pDev, GMBOX_IRQ_ACTI 
int DevGMboxIRQAction(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode)

{

    int      status = 0;

    HTC_PACKET    *pIOPacket = NULL;   

    struct htc_packet    *pIOPacket = NULL;   

    u8 GMboxIntControl[4];



    if (GMBOX_CREDIT_IRQ_ENABLE == IrqAction) {
@@ -396,7 +396,7 @@ int DevCheckGMboxInterrupts(struct ar6k_device *pDev) 
}





int DevGMboxWrite(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 WriteLength)

int DevGMboxWrite(struct ar6k_device *pDev, struct htc_packet *pPacket, u32 WriteLength)

{

    u32 paddedLength;

    bool   sync = (pPacket->Completion == NULL) ? true : false;
@@ -433,7 +433,7 @@ int DevGMboxWrite(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 WriteLength 
    return status;

}



int DevGMboxRead(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 ReadLength)

int DevGMboxRead(struct ar6k_device *pDev, struct htc_packet *pPacket, u32 ReadLength)

{

    

    u32 paddedLength;
@@ -516,7 +516,7 @@ static int ProcessCreditCounterReadBuffer(u8 *pBuffer, int Length) 
   



/* callback when our fetch to enable/disable completes */

static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket)

static void DevGMboxReadCreditsAsyncHandler(void *Context, struct htc_packet *pPacket)

{

    struct ar6k_device *pDev = (struct ar6k_device *)Context;
@@ -542,7 +542,7 @@ static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket) 
int DevGMboxReadCreditCounter(struct ar6k_device *pDev, bool AsyncMode, int *pCredits)

{

    int    status = 0;

    HTC_PACKET  *pIOPacket = NULL;  

    struct htc_packet  *pIOPacket = NULL;  

    

    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+DevGMboxReadCreditCounter (%s) \n", AsyncMode ? "ASYNC" : "SYNC"));

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

+9 −9
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ do { \ 
    (p)->HCIConfig.pHCISendComplete((p)->HCIConfig.pContext, (pt));                            \

}

    

static int HCITrySend(struct gmbox_proto_hci_uart *pProt, HTC_PACKET *pPacket, bool Synchronous);

static int HCITrySend(struct gmbox_proto_hci_uart *pProt, struct htc_packet *pPacket, bool Synchronous);



static void HCIUartCleanup(struct gmbox_proto_hci_uart *pProtocol)

{
@@ -312,7 +312,7 @@ static int HCIUartMessagePending(void *pContext, u8 LookAheadBytes[], int ValidB 
    HCI_TRANSPORT_PACKET_TYPE   pktType = HCI_PACKET_INVALID;

    bool                      recvRefillCalled = false;

    bool                      blockRecv = false;

    HTC_PACKET                  *pPacket = NULL;

    struct htc_packet                  *pPacket = NULL;

    

    /** caller guarantees that this is a fully block-able context (synch I/O is allowed) */
@@ -532,7 +532,7 @@ static int HCIUartMessagePending(void *pContext, u8 LookAheadBytes[], int ValidB 
    return status;

}



static void HCISendPacketCompletion(void *Context, HTC_PACKET *pPacket)

static void HCISendPacketCompletion(void *Context, struct htc_packet *pPacket)

{

    struct gmbox_proto_hci_uart *pProt = (struct gmbox_proto_hci_uart *)Context;

    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HCISendPacketCompletion (pPacket:0x%lX) \n",(unsigned long)pPacket));
@@ -579,7 +579,7 @@ static int SeekCreditsSynch(struct gmbox_proto_hci_uart *pProt) 
    return status;

}



static int HCITrySend(struct gmbox_proto_hci_uart *pProt, HTC_PACKET *pPacket, bool Synchronous)

static int HCITrySend(struct gmbox_proto_hci_uart *pProt, struct htc_packet *pPacket, bool Synchronous)

{   

    int    status = 0;

    int         transferLength;
@@ -796,7 +796,7 @@ static int HCITrySend(struct gmbox_proto_hci_uart *pProt, HTC_PACKET *pPacket, b 


static void FlushSendQueue(struct gmbox_proto_hci_uart *pProt)

{

    HTC_PACKET          *pPacket;

    struct htc_packet          *pPacket;

    HTC_PACKET_QUEUE    discardQueue;

    

    INIT_HTC_PACKET_QUEUE(&discardQueue);
@@ -821,7 +821,7 @@ static void FlushSendQueue(struct gmbox_proto_hci_uart *pProt) 
static void FlushRecvBuffers(struct gmbox_proto_hci_uart *pProt)

{

    HTC_PACKET_QUEUE discardQueue;

    HTC_PACKET *pPacket;

    struct htc_packet *pPacket;

    

    INIT_HTC_PACKET_QUEUE(&discardQueue);
@@ -1006,7 +1006,7 @@ int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE 
    struct gmbox_proto_hci_uart  *pProt = (struct gmbox_proto_hci_uart *)HciTrans; 

    int              status = 0;

    bool                unblockRecv = false;

    HTC_PACKET            *pPacket;

    struct htc_packet            *pPacket;

    

    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HCI_TransportAddReceivePkt \n"));
@@ -1069,7 +1069,7 @@ int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE 
    return 0;

}



int HCI_TransportSendPkt(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, bool Synchronous)

int HCI_TransportSendPkt(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet *pPacket, bool Synchronous)

{

    struct gmbox_proto_hci_uart  *pProt = (struct gmbox_proto_hci_uart *)HciTrans;
@@ -1159,7 +1159,7 @@ int HCI_TransportEnableDisableAsyncRecv(HCI_TRANSPORT_HANDLE HciTrans, bool Enab 
}



int HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans,

                                       HTC_PACKET           *pPacket,

                                       struct htc_packet           *pPacket,

                                       int                  MaxPollMS)

{

    struct gmbox_proto_hci_uart  *pProt = (struct gmbox_proto_hci_uart *)HciTrans;