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

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

ath6kl: remove-typedef HTC_ENDPOINT_CREDIT_DIST 



This required two passes:

remove-typedef -s HTC_ENDPOINT_CREDIT_DIST \
	"struct htc_endpoint_credit_dist" drivers/staging/ath6kl/

remove-typedef -s _HTC_ENDPOINT_CREDIT_DIST \
	"struct htc_endpoint_credit_dist" 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 df5a718f

drivers/staging/ath6kl/htc2/htc_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct htc_endpoint { 
                                                   non-zero value means this endpoint is in use */

    HTC_PACKET_QUEUE            TxQueue;        /* HTC frame buffer TX queue */

    HTC_PACKET_QUEUE            RxBuffers;      /* HTC frame buffer RX list */

    HTC_ENDPOINT_CREDIT_DIST    CreditDist;     /* credit distribution structure (exposed to driver layer) */

    struct htc_endpoint_credit_dist    CreditDist;     /* credit distribution structure (exposed to driver layer) */

    HTC_EP_CALLBACKS            EpCallBacks;    /* callbacks associated with this endpoint */

    int                         MaxTxQueueDepth;   /* max depth of the TX queue before we need to

                                                      call driver's full handler */
@@ -111,7 +111,7 @@ struct htc_control_buffer { 
typedef struct _HTC_TARGET {

    struct htc_endpoint                EndPoint[ENDPOINT_MAX];

    struct htc_control_buffer          HTCControlBuffers[NUM_CONTROL_BUFFERS];

    HTC_ENDPOINT_CREDIT_DIST   *EpCreditDistributionListHead;

    struct htc_endpoint_credit_dist   *EpCreditDistributionListHead;

    HTC_PACKET_QUEUE            ControlBufferTXFreeList;

    HTC_PACKET_QUEUE            ControlBufferRXFreeList;

    HTC_CREDIT_DIST_CALLBACK    DistributeCredits;
@@ -176,7 +176,7 @@ void HTCFlushRecvBuffers(HTC_TARGET *target); 
void        HTCFlushSendPkts(HTC_TARGET *target);



#ifdef ATH_DEBUG_MODULE

void        DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist);

void        DumpCreditDist(struct htc_endpoint_credit_dist *pEPDist);

void        DumpCreditDistStates(HTC_TARGET *target);

void 		DebugDumpBytes(u8 *buffer, u16 length, char *pDescription);

#endif

drivers/staging/ath6kl/htc2/htc_send.c

+3 −3
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ int HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) 
static INLINE void HTCCheckEndpointTxQueues(HTC_TARGET *target)

{

    struct htc_endpoint                *pEndpoint;

    HTC_ENDPOINT_CREDIT_DIST    *pDistItem;

    struct htc_endpoint_credit_dist    *pDistItem;



    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCCheckEndpointTxQueues \n"));

    pDistItem = target->EpCreditDistributionListHead;
@@ -879,7 +879,7 @@ static void HTCFlushEndpointTX(HTC_TARGET *target, struct htc_endpoint *pEndpoin 


}



void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist)

void DumpCreditDist(struct htc_endpoint_credit_dist *pEPDist)

{

    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("--- EP : %d  ServiceID: 0x%X    --------------\n",

                        pEPDist->Endpoint, pEPDist->ServiceID));
@@ -901,7 +901,7 @@ void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist) 


void DumpCreditDistStates(HTC_TARGET *target)

{

    HTC_ENDPOINT_CREDIT_DIST *pEPList = target->EpCreditDistributionListHead;

    struct htc_endpoint_credit_dist *pEPList = target->EpCreditDistributionListHead;



    while (pEPList != NULL) {

        DumpCreditDist(pEPList);

drivers/staging/ath6kl/htc2/htc_services.c

+6 −6
Original line number Diff line number Diff line
@@ -307,9 +307,9 @@ int HTCConnectService(HTC_HANDLE HTCHandle, 
    return status;

}



static void AddToEndpointDistList(HTC_TARGET *target, HTC_ENDPOINT_CREDIT_DIST *pEpDist)

static void AddToEndpointDistList(HTC_TARGET *target, struct htc_endpoint_credit_dist *pEpDist)

{

    HTC_ENDPOINT_CREDIT_DIST *pCurEntry,*pLastEntry;

    struct htc_endpoint_credit_dist *pCurEntry,*pLastEntry;



    if (NULL == target->EpCreditDistributionListHead) {

        target->EpCreditDistributionListHead = pEpDist;
@@ -336,10 +336,10 @@ static void AddToEndpointDistList(HTC_TARGET *target, HTC_ENDPOINT_CREDIT_DIST * 


/* default credit init callback */

static void HTCDefaultCreditInit(void                     *Context,

                                 HTC_ENDPOINT_CREDIT_DIST *pEPList,

                                 struct htc_endpoint_credit_dist *pEPList,

                                 int                      TotalCredits)

{

    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;

    struct htc_endpoint_credit_dist *pCurEpDist;

    int                      totalEps = 0;

    int                      creditsPerEndpoint;
@@ -379,10 +379,10 @@ static void HTCDefaultCreditInit(void *Context, 


/* default credit distribution callback, NOTE, this callback holds the TX lock */

void HTCDefaultCreditDist(void                     *Context,

                          HTC_ENDPOINT_CREDIT_DIST *pEPDistList,

                          struct htc_endpoint_credit_dist *pEPDistList,

                          HTC_CREDIT_DIST_REASON   Reason)

{

    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;

    struct htc_endpoint_credit_dist *pCurEpDist;



    if (Reason == HTC_CREDIT_DIST_SEND_COMPLETE) {

        pCurEpDist = pEPDistList;

drivers/staging/ath6kl/include/common_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct common_credit_state_info { 
    int TotalAvailableCredits;      /* total credits in the system at startup */

    int CurrentFreeCredits;         /* credits available in the pool that have not been

                                       given out to endpoints */

    HTC_ENDPOINT_CREDIT_DIST *pLowestPriEpDist;  /* pointer to the lowest priority endpoint dist struct */

    struct htc_endpoint_credit_dist *pLowestPriEpDist;  /* pointer to the lowest priority endpoint dist struct */

};



struct hci_transport_callbacks {

drivers/staging/ath6kl/include/htc_api.h

+6 −6
Original line number Diff line number Diff line
@@ -163,9 +163,9 @@ typedef struct _HTC_SERVICE_CONNECT_RESP { 
} HTC_SERVICE_CONNECT_RESP;



/* endpoint distribution structure */

typedef struct _HTC_ENDPOINT_CREDIT_DIST {

    struct _HTC_ENDPOINT_CREDIT_DIST *pNext;

    struct _HTC_ENDPOINT_CREDIT_DIST *pPrev;

struct htc_endpoint_credit_dist {

    struct htc_endpoint_credit_dist *pNext;

    struct htc_endpoint_credit_dist *pPrev;

    HTC_SERVICE_ID      ServiceID;          /* Service ID (set by HTC) */

    HTC_ENDPOINT_ID     Endpoint;           /* endpoint for this distribution struct (set by HTC) */

    u32 DistFlags;          /* distribution flags, distribution function can
@@ -195,7 +195,7 @@ typedef struct _HTC_ENDPOINT_CREDIT_DIST { 
                                               or HTC_CREDIT_DIST_SEND_COMPLETE is indicated on an endpoint

                                               that has non-zero credits to recover

                                              */

} HTC_ENDPOINT_CREDIT_DIST;

};



#define HTC_EP_ACTIVE                            ((u32) (1u << 31))
@@ -216,11 +216,11 @@ typedef enum _HTC_CREDIT_DIST_REASON { 
} HTC_CREDIT_DIST_REASON;



typedef void (*HTC_CREDIT_DIST_CALLBACK)(void                     *Context,

                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,

                                         struct htc_endpoint_credit_dist *pEPList,

                                         HTC_CREDIT_DIST_REASON   Reason);



typedef void (*HTC_CREDIT_INIT_CALLBACK)(void *Context,

                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,

                                         struct htc_endpoint_credit_dist *pEPList,

                                         int                      TotalCredits);



    /* endpoint statistics action */