From: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
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: Naveen Singh <nsingh@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/ath6kl/htc2/htc_internal.h | 6 +++---
drivers/staging/ath6kl/htc2/htc_send.c | 6 +++---
drivers/staging/ath6kl/htc2/htc_services.c | 12 ++++++------
drivers/staging/ath6kl/include/common_drv.h | 2 +-
drivers/staging/ath6kl/include/htc_api.h | 12 ++++++------
drivers/staging/ath6kl/miscdrv/credit_dist.c | 22 +++++++++++-----------
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h
index a6eaa1b..d726a02 100644
--- a/drivers/staging/ath6kl/htc2/htc_internal.h
+++ b/drivers/staging/ath6kl/htc2/htc_internal.h
@@ -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
diff --git a/drivers/staging/ath6kl/htc2/htc_send.c b/drivers/staging/ath6kl/htc2/htc_send.c
index 4e1d9bc7..b313573 100644
--- a/drivers/staging/ath6kl/htc2/htc_send.c
+++ b/drivers/staging/ath6kl/htc2/htc_send.c
@@ -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);
diff --git a/drivers/staging/ath6kl/htc2/htc_services.c b/drivers/staging/ath6kl/htc2/htc_services.c
index 2f99989..34bba7e 100644
--- a/drivers/staging/ath6kl/htc2/htc_services.c
+++ b/drivers/staging/ath6kl/htc2/htc_services.c
@@ -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;
diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h
index 4c70a77..3508df4 100644
--- a/drivers/staging/ath6kl/include/common_drv.h
+++ b/drivers/staging/ath6kl/include/common_drv.h
@@ -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 {
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h
index c5c9fed..f5baf74 100644
--- a/drivers/staging/ath6kl/include/htc_api.h
+++ b/drivers/staging/ath6kl/include/htc_api.h
@@ -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 */
diff --git a/drivers/staging/ath6kl/miscdrv/credit_dist.c b/drivers/staging/ath6kl/miscdrv/credit_dist.c
index 8c418d2..ae54e1f 100644
--- a/drivers/staging/ath6kl/miscdrv/credit_dist.c
+++ b/drivers/staging/ath6kl/miscdrv/credit_dist.c
@@ -42,14 +42,14 @@
#endif
static void RedistributeCredits(struct common_credit_state_info *pCredInfo,
- HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
+ struct htc_endpoint_credit_dist *pEPDistList);
static void SeekCredits(struct common_credit_state_info *pCredInfo,
- HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
+ struct htc_endpoint_credit_dist *pEPDistList);
/* reduce an ep's credits back to a set limit */
static INLINE void ReduceCredits(struct common_credit_state_info *pCredInfo,
- HTC_ENDPOINT_CREDIT_DIST *pEpDist,
+ struct htc_endpoint_credit_dist *pEpDist,
int Limit)
{
int credits;
@@ -81,10 +81,10 @@ static INLINE void ReduceCredits(struct common_credit_state_info *pCredInfo,
* This function is called in the context of HTCStart() to setup initial (application-specific)
* credit distributions */
static void ar6000_credit_init(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 count;
struct common_credit_state_info *pCredInfo = (struct common_credit_state_info *)Context;
@@ -175,10 +175,10 @@ static void ar6000_credit_init(void *Context,
*
*/
static void ar6000_credit_distribute(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;
struct common_credit_state_info *pCredInfo = (struct common_credit_state_info *)Context;
switch (Reason) {
@@ -244,9 +244,9 @@ static void ar6000_credit_distribute(void *Context,
/* redistribute credits based on activity change */
static void RedistributeCredits(struct common_credit_state_info *pCredInfo,
- HTC_ENDPOINT_CREDIT_DIST *pEPDistList)
+ struct htc_endpoint_credit_dist *pEPDistList)
{
- HTC_ENDPOINT_CREDIT_DIST *pCurEpDist = pEPDistList;
+ struct htc_endpoint_credit_dist *pCurEpDist = pEPDistList;
/* walk through the list and remove credits from inactive endpoints */
while (pCurEpDist != NULL) {
@@ -284,9 +284,9 @@ static void RedistributeCredits(struct common_credit_state_info *pCredInfo,
/* HTC has an endpoint that needs credits, pEPDist is the endpoint in question */
static void SeekCredits(struct common_credit_state_info *pCredInfo,
- HTC_ENDPOINT_CREDIT_DIST *pEPDist)
+ struct htc_endpoint_credit_dist *pEPDist)
{
- HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
+ struct htc_endpoint_credit_dist *pCurEpDist;
int credits = 0;
int need;
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
