diff options
-rw-r--r-- | drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/dl_list.h | 26 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/hif.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/htc_packet.h | 8 |
7 files changed, 22 insertions, 22 deletions
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h index 87057e35edd..b5d1ad430ff 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h | |||
@@ -77,7 +77,7 @@ struct hif_device { | |||
77 | void *claimedContext; | 77 | void *claimedContext; |
78 | HTC_CALLBACKS htcCallbacks; | 78 | HTC_CALLBACKS htcCallbacks; |
79 | u8 *dma_buffer; | 79 | u8 *dma_buffer; |
80 | DL_LIST ScatterReqHead; /* scatter request list head */ | 80 | struct dl_list ScatterReqHead; /* scatter request list head */ |
81 | bool scatter_enabled; /* scatter enabled flag */ | 81 | bool scatter_enabled; /* scatter enabled flag */ |
82 | bool is_suspend; | 82 | bool is_suspend; |
83 | bool is_disabled; | 83 | bool is_disabled; |
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c index 78cbbb11ed6..2a56a50bc21 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | |||
@@ -62,7 +62,7 @@ static void FreeScatterReq(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq) | |||
62 | 62 | ||
63 | static HIF_SCATTER_REQ *AllocScatterReq(HIF_DEVICE *device) | 63 | static HIF_SCATTER_REQ *AllocScatterReq(HIF_DEVICE *device) |
64 | { | 64 | { |
65 | DL_LIST *pItem; | 65 | struct dl_list *pItem; |
66 | unsigned long flag; | 66 | unsigned long flag; |
67 | 67 | ||
68 | spin_lock_irqsave(&device->lock, flag); | 68 | spin_lock_irqsave(&device->lock, flag); |
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c index a41ed12043d..f9f411ae43b 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c | |||
@@ -589,7 +589,7 @@ void DevDumpRegisters(struct ar6k_device *pDev, | |||
589 | 589 | ||
590 | static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context) | 590 | static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context) |
591 | { | 591 | { |
592 | DL_LIST *pItem; | 592 | struct dl_list *pItem; |
593 | struct ar6k_device *pDev = (struct ar6k_device *)Context; | 593 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
594 | LOCK_AR6K(pDev); | 594 | LOCK_AR6K(pDev); |
595 | pItem = DL_ListRemoveItemFromHead(&pDev->ScatterReqHead); | 595 | pItem = DL_ListRemoveItemFromHead(&pDev->ScatterReqHead); |
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h index 3e4ece865be..88ef25a1abc 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h | |||
@@ -133,7 +133,7 @@ struct ar6k_device { | |||
133 | bool DSRCanYield; | 133 | bool DSRCanYield; |
134 | int CurrentDSRRecvCount; | 134 | int CurrentDSRRecvCount; |
135 | HIF_DEVICE_SCATTER_SUPPORT_INFO HifScatterInfo; | 135 | HIF_DEVICE_SCATTER_SUPPORT_INFO HifScatterInfo; |
136 | DL_LIST ScatterReqHead; | 136 | struct dl_list ScatterReqHead; |
137 | bool ScatterIsVirtual; | 137 | bool ScatterIsVirtual; |
138 | int MaxRecvBundleSize; | 138 | int MaxRecvBundleSize; |
139 | int MaxSendBundleSize; | 139 | int MaxSendBundleSize; |
diff --git a/drivers/staging/ath6kl/include/dl_list.h b/drivers/staging/ath6kl/include/dl_list.h index 110e1d8b047..13b1e6956c2 100644 --- a/drivers/staging/ath6kl/include/dl_list.h +++ b/drivers/staging/ath6kl/include/dl_list.h | |||
@@ -32,10 +32,10 @@ | |||
32 | 32 | ||
33 | /* list functions */ | 33 | /* list functions */ |
34 | /* pointers for the list */ | 34 | /* pointers for the list */ |
35 | typedef struct _DL_LIST { | 35 | struct dl_list { |
36 | struct _DL_LIST *pPrev; | 36 | struct dl_list *pPrev; |
37 | struct _DL_LIST *pNext; | 37 | struct dl_list *pNext; |
38 | }DL_LIST, *PDL_LIST; | 38 | }; |
39 | /* | 39 | /* |
40 | * DL_LIST_INIT , initialize doubly linked list | 40 | * DL_LIST_INIT , initialize doubly linked list |
41 | */ | 41 | */ |
@@ -67,7 +67,7 @@ typedef struct _DL_LIST { | |||
67 | */ | 67 | */ |
68 | #define ITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset) \ | 68 | #define ITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset) \ |
69 | { \ | 69 | { \ |
70 | PDL_LIST pTemp; \ | 70 | struct dl_list * pTemp; \ |
71 | pTemp = (pStart)->pNext; \ | 71 | pTemp = (pStart)->pNext; \ |
72 | while (pTemp != (pStart)) { \ | 72 | while (pTemp != (pStart)) { \ |
73 | (pItem) = A_CONTAINING_STRUCT(pTemp,st,offset); \ | 73 | (pItem) = A_CONTAINING_STRUCT(pTemp,st,offset); \ |
@@ -78,7 +78,7 @@ typedef struct _DL_LIST { | |||
78 | /* | 78 | /* |
79 | * DL_ListInsertTail - insert pAdd to the end of the list | 79 | * DL_ListInsertTail - insert pAdd to the end of the list |
80 | */ | 80 | */ |
81 | static INLINE PDL_LIST DL_ListInsertTail(PDL_LIST pList, PDL_LIST pAdd) { | 81 | static INLINE struct dl_list *DL_ListInsertTail(struct dl_list *pList, struct dl_list *pAdd) { |
82 | /* insert at tail */ | 82 | /* insert at tail */ |
83 | pAdd->pPrev = pList->pPrev; | 83 | pAdd->pPrev = pList->pPrev; |
84 | pAdd->pNext = pList; | 84 | pAdd->pNext = pList; |
@@ -90,7 +90,7 @@ static INLINE PDL_LIST DL_ListInsertTail(PDL_LIST pList, PDL_LIST pAdd) { | |||
90 | /* | 90 | /* |
91 | * DL_ListInsertHead - insert pAdd into the head of the list | 91 | * DL_ListInsertHead - insert pAdd into the head of the list |
92 | */ | 92 | */ |
93 | static INLINE PDL_LIST DL_ListInsertHead(PDL_LIST pList, PDL_LIST pAdd) { | 93 | static INLINE struct dl_list * DL_ListInsertHead(struct dl_list * pList, struct dl_list * pAdd) { |
94 | /* insert at head */ | 94 | /* insert at head */ |
95 | pAdd->pPrev = pList; | 95 | pAdd->pPrev = pList; |
96 | pAdd->pNext = pList->pNext; | 96 | pAdd->pNext = pList->pNext; |
@@ -103,7 +103,7 @@ static INLINE PDL_LIST DL_ListInsertHead(PDL_LIST pList, PDL_LIST pAdd) { | |||
103 | /* | 103 | /* |
104 | * DL_ListRemove - remove pDel from list | 104 | * DL_ListRemove - remove pDel from list |
105 | */ | 105 | */ |
106 | static INLINE PDL_LIST DL_ListRemove(PDL_LIST pDel) { | 106 | static INLINE struct dl_list * DL_ListRemove(struct dl_list * pDel) { |
107 | pDel->pNext->pPrev = pDel->pPrev; | 107 | pDel->pNext->pPrev = pDel->pPrev; |
108 | pDel->pPrev->pNext = pDel->pNext; | 108 | pDel->pPrev->pNext = pDel->pNext; |
109 | /* point back to itself just to be safe, incase remove is called again */ | 109 | /* point back to itself just to be safe, incase remove is called again */ |
@@ -115,8 +115,8 @@ static INLINE PDL_LIST DL_ListRemove(PDL_LIST pDel) { | |||
115 | /* | 115 | /* |
116 | * DL_ListRemoveItemFromHead - get a list item from the head | 116 | * DL_ListRemoveItemFromHead - get a list item from the head |
117 | */ | 117 | */ |
118 | static INLINE PDL_LIST DL_ListRemoveItemFromHead(PDL_LIST pList) { | 118 | static INLINE struct dl_list * DL_ListRemoveItemFromHead(struct dl_list * pList) { |
119 | PDL_LIST pItem = NULL; | 119 | struct dl_list * pItem = NULL; |
120 | if (pList->pNext != pList) { | 120 | if (pList->pNext != pList) { |
121 | pItem = pList->pNext; | 121 | pItem = pList->pNext; |
122 | /* remove the first item from head */ | 122 | /* remove the first item from head */ |
@@ -125,8 +125,8 @@ static INLINE PDL_LIST DL_ListRemoveItemFromHead(PDL_LIST pList) { | |||
125 | return pItem; | 125 | return pItem; |
126 | } | 126 | } |
127 | 127 | ||
128 | static INLINE PDL_LIST DL_ListRemoveItemFromTail(PDL_LIST pList) { | 128 | static INLINE struct dl_list * DL_ListRemoveItemFromTail(struct dl_list * pList) { |
129 | PDL_LIST pItem = NULL; | 129 | struct dl_list * pItem = NULL; |
130 | if (pList->pPrev != pList) { | 130 | if (pList->pPrev != pList) { |
131 | pItem = pList->pPrev; | 131 | pItem = pList->pPrev; |
132 | /* remove the item from tail */ | 132 | /* remove the item from tail */ |
@@ -136,7 +136,7 @@ static INLINE PDL_LIST DL_ListRemoveItemFromTail(PDL_LIST pList) { | |||
136 | } | 136 | } |
137 | 137 | ||
138 | /* transfer src list items to the tail of the destination list */ | 138 | /* transfer src list items to the tail of the destination list */ |
139 | static INLINE void DL_ListTransferItemsToTail(PDL_LIST pDest, PDL_LIST pSrc) { | 139 | static INLINE void DL_ListTransferItemsToTail(struct dl_list * pDest, struct dl_list * pSrc) { |
140 | /* only concatenate if src is not empty */ | 140 | /* only concatenate if src is not empty */ |
141 | if (!DL_LIST_IS_EMPTY(pSrc)) { | 141 | if (!DL_LIST_IS_EMPTY(pSrc)) { |
142 | /* cut out circular list in src and re-attach to end of dest */ | 142 | /* cut out circular list in src and re-attach to end of dest */ |
diff --git a/drivers/staging/ath6kl/include/hif.h b/drivers/staging/ath6kl/include/hif.h index ab1f4c1ad91..3421a593a0c 100644 --- a/drivers/staging/ath6kl/include/hif.h +++ b/drivers/staging/ath6kl/include/hif.h | |||
@@ -287,7 +287,7 @@ typedef enum _HIF_SCATTER_METHOD { | |||
287 | } HIF_SCATTER_METHOD; | 287 | } HIF_SCATTER_METHOD; |
288 | 288 | ||
289 | typedef struct _HIF_SCATTER_REQ { | 289 | typedef struct _HIF_SCATTER_REQ { |
290 | DL_LIST ListLink; /* link management */ | 290 | struct dl_list ListLink; /* link management */ |
291 | u32 Address; /* address for the read/write operation */ | 291 | u32 Address; /* address for the read/write operation */ |
292 | u32 Request; /* request flags */ | 292 | u32 Request; /* request flags */ |
293 | u32 TotalLength; /* total length of entire transfer */ | 293 | u32 TotalLength; /* total length of entire transfer */ |
diff --git a/drivers/staging/ath6kl/include/htc_packet.h b/drivers/staging/ath6kl/include/htc_packet.h index fcf0a0c3bed..9282e909fc8 100644 --- a/drivers/staging/ath6kl/include/htc_packet.h +++ b/drivers/staging/ath6kl/include/htc_packet.h | |||
@@ -69,7 +69,7 @@ typedef struct _HTC_RX_PACKET_INFO { | |||
69 | 69 | ||
70 | /* wrapper around endpoint-specific packets */ | 70 | /* wrapper around endpoint-specific packets */ |
71 | typedef struct _HTC_PACKET { | 71 | typedef struct _HTC_PACKET { |
72 | DL_LIST ListLink; /* double link */ | 72 | struct dl_list ListLink; /* double link */ |
73 | void *pPktContext; /* caller's per packet specific context */ | 73 | void *pPktContext; /* caller's per packet specific context */ |
74 | 74 | ||
75 | u8 *pBufferStart; /* the true buffer start , the caller can | 75 | u8 *pBufferStart; /* the true buffer start , the caller can |
@@ -140,7 +140,7 @@ typedef struct _HTC_PACKET { | |||
140 | 140 | ||
141 | /* HTC Packet Queueing Macros */ | 141 | /* HTC Packet Queueing Macros */ |
142 | typedef struct _HTC_PACKET_QUEUE { | 142 | typedef struct _HTC_PACKET_QUEUE { |
143 | DL_LIST QueueHead; | 143 | struct dl_list QueueHead; |
144 | int Depth; | 144 | int Depth; |
145 | } HTC_PACKET_QUEUE; | 145 | } HTC_PACKET_QUEUE; |
146 | 146 | ||
@@ -180,7 +180,7 @@ static INLINE HTC_PACKET *HTC_GET_PKT_AT_HEAD(HTC_PACKET_QUEUE *queue) { | |||
180 | 180 | ||
181 | /* dequeue an HTC packet from the head of the queue */ | 181 | /* dequeue an HTC packet from the head of the queue */ |
182 | static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) { | 182 | static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) { |
183 | DL_LIST *pItem = DL_ListRemoveItemFromHead(&queue->QueueHead); | 183 | struct dl_list *pItem = DL_ListRemoveItemFromHead(&queue->QueueHead); |
184 | if (pItem != NULL) { | 184 | if (pItem != NULL) { |
185 | queue->Depth--; | 185 | queue->Depth--; |
186 | return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink); | 186 | return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink); |
@@ -190,7 +190,7 @@ static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) { | |||
190 | 190 | ||
191 | /* dequeue an HTC packet from the tail of the queue */ | 191 | /* dequeue an HTC packet from the tail of the queue */ |
192 | static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE_TAIL(HTC_PACKET_QUEUE *queue) { | 192 | static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE_TAIL(HTC_PACKET_QUEUE *queue) { |
193 | DL_LIST *pItem = DL_ListRemoveItemFromTail(&queue->QueueHead); | 193 | struct dl_list *pItem = DL_ListRemoveItemFromTail(&queue->QueueHead); |
194 | if (pItem != NULL) { | 194 | if (pItem != NULL) { |
195 | queue->Depth--; | 195 | queue->Depth--; |
196 | return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink); | 196 | return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink); |