Skip to content

Commit a99ead4

Browse files
treedaviesgregkh
treedavies
authored and
gregkh
committed
Staging: rtl8192e: rename linked list reference: List
Rename variable List to list, to fix Avoid CamelCase checkpatch warning. Signed-off-by: Tree Davies <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9366378 commit a99ead4

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎drivers/staging/rtl8192e/rtl819x_TS.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ enum tr_select {
1717
};
1818

1919
struct ts_common_info {
20-
struct list_head List;
20+
struct list_head list;
2121
u8 addr[ETH_ALEN];
2222
struct qos_tsinfo tspec;
2323
};

‎drivers/staging/rtl8192e/rtl819x_TSProc.c‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ static void RxPktPendingTimeout(struct timer_list *t)
2525
while (!list_empty(&ts->rx_pending_pkt_list)) {
2626
pReorderEntry = (struct rx_reorder_entry *)
2727
list_entry(ts->rx_pending_pkt_list.prev,
28-
struct rx_reorder_entry, List);
28+
struct rx_reorder_entry, list);
2929
if (index == 0)
3030
ts->rx_indicate_seq = pReorderEntry->SeqNum;
3131

3232
if (SN_LESS(pReorderEntry->SeqNum,
3333
ts->rx_indicate_seq) ||
3434
SN_EQUAL(pReorderEntry->SeqNum,
3535
ts->rx_indicate_seq)) {
36-
list_del_init(&pReorderEntry->List);
36+
list_del_init(&pReorderEntry->list);
3737

3838
if (SN_EQUAL(pReorderEntry->SeqNum,
3939
ts->rx_indicate_seq))
@@ -47,7 +47,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
4747
pReorderEntry->prxb;
4848
index++;
4949

50-
list_add_tail(&pReorderEntry->List,
50+
list_add_tail(&pReorderEntry->list,
5151
&ieee->RxReorder_Unused_List);
5252
} else {
5353
bPktInBuf = true;
@@ -138,7 +138,7 @@ void rtllib_ts_init(struct rtllib_device *ieee)
138138
rtllib_tx_ba_inact_timeout, 0);
139139

140140
ResetTxTsEntry(pTxTS);
141-
list_add_tail(&pTxTS->ts_common_info.List,
141+
list_add_tail(&pTxTS->ts_common_info.list,
142142
&ieee->Tx_TS_Unused_List);
143143
pTxTS++;
144144
}
@@ -155,13 +155,13 @@ void rtllib_ts_init(struct rtllib_device *ieee)
155155
timer_setup(&rxts->rx_pkt_pending_timer, RxPktPendingTimeout, 0);
156156

157157
ResetRxTsEntry(rxts);
158-
list_add_tail(&rxts->ts_common_info.List,
158+
list_add_tail(&rxts->ts_common_info.list,
159159
&ieee->Rx_TS_Unused_List);
160160
rxts++;
161161
}
162162
INIT_LIST_HEAD(&ieee->RxReorder_Unused_List);
163163
for (count = 0; count < REORDER_ENTRY_NUM; count++) {
164-
list_add_tail(&pRxReorderEntry->List,
164+
list_add_tail(&pRxReorderEntry->list,
165165
&ieee->RxReorder_Unused_List);
166166
if (count == (REORDER_ENTRY_NUM - 1))
167167
break;
@@ -196,17 +196,17 @@ static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,
196196
for (dir = 0; dir <= DIR_BI_DIR; dir++) {
197197
if (!search_dir[dir])
198198
continue;
199-
list_for_each_entry(pRet, psearch_list, List) {
199+
list_for_each_entry(pRet, psearch_list, list) {
200200
if (memcmp(pRet->addr, addr, 6) == 0 &&
201201
pRet->tspec.ucTSID == TID &&
202202
pRet->tspec.ucDirection == dir)
203203
break;
204204
}
205-
if (&pRet->List != psearch_list)
205+
if (&pRet->list != psearch_list)
206206
break;
207207
}
208208

209-
if (pRet && &pRet->List != psearch_list)
209+
if (pRet && &pRet->list != psearch_list)
210210
return pRet;
211211
return NULL;
212212
}
@@ -286,8 +286,8 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,
286286

287287
if (!list_empty(pUnusedList)) {
288288
(*ppTS) = list_entry(pUnusedList->next,
289-
struct ts_common_info, List);
290-
list_del_init(&(*ppTS)->List);
289+
struct ts_common_info, list);
290+
list_del_init(&(*ppTS)->list);
291291
if (TxRxSelect == TX_DIR) {
292292
struct tx_ts_record *tmp =
293293
container_of(*ppTS,
@@ -309,7 +309,7 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,
309309
ts_info->ucDirection = Dir;
310310

311311
MakeTSEntry(*ppTS, addr, &tspec);
312-
list_add_tail(&((*ppTS)->List), pAddmitList);
312+
list_add_tail(&((*ppTS)->list), pAddmitList);
313313

314314
return true;
315315
}
@@ -335,10 +335,10 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
335335
while (!list_empty(&ts->rx_pending_pkt_list)) {
336336
pRxReorderEntry = (struct rx_reorder_entry *)
337337
list_entry(ts->rx_pending_pkt_list.prev,
338-
struct rx_reorder_entry, List);
338+
struct rx_reorder_entry, list);
339339
netdev_dbg(ieee->dev, "%s(): Delete SeqNum %d!\n",
340340
__func__, pRxReorderEntry->SeqNum);
341-
list_del_init(&pRxReorderEntry->List);
341+
list_del_init(&pRxReorderEntry->list);
342342
{
343343
int i = 0;
344344
struct rtllib_rxb *prxb = pRxReorderEntry->prxb;
@@ -350,7 +350,7 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
350350
kfree(prxb);
351351
prxb = NULL;
352352
}
353-
list_add_tail(&pRxReorderEntry->List,
353+
list_add_tail(&pRxReorderEntry->list,
354354
&ieee->RxReorder_Unused_List);
355355
}
356356
} else {
@@ -366,37 +366,37 @@ void RemovePeerTS(struct rtllib_device *ieee, u8 *addr)
366366

367367
netdev_info(ieee->dev, "===========>%s, %pM\n", __func__, addr);
368368

369-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
369+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, list) {
370370
if (memcmp(ts->addr, addr, 6) == 0) {
371371
RemoveTsEntry(ieee, ts, TX_DIR);
372-
list_del_init(&ts->List);
373-
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
372+
list_del_init(&ts->list);
373+
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
374374
}
375375
}
376376

377-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
377+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, list) {
378378
if (memcmp(ts->addr, addr, 6) == 0) {
379379
netdev_info(ieee->dev,
380380
"====>remove Tx_TS_admin_list\n");
381381
RemoveTsEntry(ieee, ts, TX_DIR);
382-
list_del_init(&ts->List);
383-
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
382+
list_del_init(&ts->list);
383+
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
384384
}
385385
}
386386

387-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
387+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, list) {
388388
if (memcmp(ts->addr, addr, 6) == 0) {
389389
RemoveTsEntry(ieee, ts, RX_DIR);
390-
list_del_init(&ts->List);
391-
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
390+
list_del_init(&ts->list);
391+
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
392392
}
393393
}
394394

395-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
395+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, list) {
396396
if (memcmp(ts->addr, addr, 6) == 0) {
397397
RemoveTsEntry(ieee, ts, RX_DIR);
398-
list_del_init(&ts->List);
399-
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
398+
list_del_init(&ts->list);
399+
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
400400
}
401401
}
402402
}
@@ -406,28 +406,28 @@ void RemoveAllTS(struct rtllib_device *ieee)
406406
{
407407
struct ts_common_info *ts, *pTmpTS;
408408

409-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
409+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, list) {
410410
RemoveTsEntry(ieee, ts, TX_DIR);
411-
list_del_init(&ts->List);
412-
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
411+
list_del_init(&ts->list);
412+
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
413413
}
414414

415-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
415+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, list) {
416416
RemoveTsEntry(ieee, ts, TX_DIR);
417-
list_del_init(&ts->List);
418-
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
417+
list_del_init(&ts->list);
418+
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
419419
}
420420

421-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
421+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, list) {
422422
RemoveTsEntry(ieee, ts, RX_DIR);
423-
list_del_init(&ts->List);
424-
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
423+
list_del_init(&ts->list);
424+
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
425425
}
426426

427-
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
427+
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, list) {
428428
RemoveTsEntry(ieee, ts, RX_DIR);
429-
list_del_init(&ts->List);
430-
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
429+
list_del_init(&ts->list);
430+
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
431431
}
432432
}
433433

‎drivers/staging/rtl8192e/rtllib.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ struct bandwidth_autoswitch {
10421042
#define REORDER_WIN_SIZE 128
10431043
#define REORDER_ENTRY_NUM 128
10441044
struct rx_reorder_entry {
1045-
struct list_head List;
1045+
struct list_head list;
10461046
u16 SeqNum;
10471047
struct rtllib_rxb *prxb;
10481048
};

‎drivers/staging/rtl8192e/rtllib_rx.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -411,19 +411,19 @@ static bool AddReorderEntry(struct rx_ts_record *ts,
411411
while (pList->next != &ts->rx_pending_pkt_list) {
412412
if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)
413413
list_entry(pList->next, struct rx_reorder_entry,
414-
List))->SeqNum))
414+
list))->SeqNum))
415415
pList = pList->next;
416416
else if (SN_EQUAL(pReorderEntry->SeqNum,
417417
((struct rx_reorder_entry *)list_entry(pList->next,
418-
struct rx_reorder_entry, List))->SeqNum))
418+
struct rx_reorder_entry, list))->SeqNum))
419419
return false;
420420
else
421421
break;
422422
}
423-
pReorderEntry->List.next = pList->next;
424-
pReorderEntry->List.next->prev = &pReorderEntry->List;
425-
pReorderEntry->List.prev = pList;
426-
pList->next = &pReorderEntry->List;
423+
pReorderEntry->list.next = pList->next;
424+
pReorderEntry->list.next->prev = &pReorderEntry->list;
425+
pReorderEntry->list.prev = pList;
426+
pList->next = &pReorderEntry->list;
427427

428428
return true;
429429
}
@@ -504,15 +504,15 @@ void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,
504504

505505
pRxReorderEntry = (struct rx_reorder_entry *)
506506
list_entry(ts->rx_pending_pkt_list.prev,
507-
struct rx_reorder_entry, List);
507+
struct rx_reorder_entry, list);
508508
netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n", __func__,
509509
pRxReorderEntry->SeqNum);
510-
list_del_init(&pRxReorderEntry->List);
510+
list_del_init(&pRxReorderEntry->list);
511511

512512
ieee->RfdArray[RfdCnt] = pRxReorderEntry->prxb;
513513

514514
RfdCnt = RfdCnt + 1;
515-
list_add_tail(&pRxReorderEntry->List,
515+
list_add_tail(&pRxReorderEntry->list,
516516
&ieee->RxReorder_Unused_List);
517517
}
518518
rtllib_indicate_packets(ieee, ieee->RfdArray, RfdCnt);
@@ -601,8 +601,8 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
601601
if (!list_empty(&ieee->RxReorder_Unused_List)) {
602602
pReorderEntry = (struct rx_reorder_entry *)
603603
list_entry(ieee->RxReorder_Unused_List.next,
604-
struct rx_reorder_entry, List);
605-
list_del_init(&pReorderEntry->List);
604+
struct rx_reorder_entry, list);
605+
list_del_init(&pReorderEntry->list);
606606

607607
/* Make a reorder entry and insert
608608
* into a the packet list.
@@ -617,7 +617,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
617617
"%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n",
618618
__func__, ts->rx_indicate_seq,
619619
SeqNum);
620-
list_add_tail(&pReorderEntry->List,
620+
list_add_tail(&pReorderEntry->list,
621621
&ieee->RxReorder_Unused_List);
622622

623623
for (i = 0; i < prxb->nr_subframes; i++)
@@ -657,7 +657,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
657657
pReorderEntry = (struct rx_reorder_entry *)
658658
list_entry(ts->rx_pending_pkt_list.prev,
659659
struct rx_reorder_entry,
660-
List);
660+
list);
661661
if (SN_LESS(pReorderEntry->SeqNum, ts->rx_indicate_seq) ||
662662
SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq)) {
663663
/* This protect struct buffer from overflow. */
@@ -669,7 +669,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
669669
break;
670670
}
671671

672-
list_del_init(&pReorderEntry->List);
672+
list_del_init(&pReorderEntry->list);
673673

674674
if (SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq))
675675
ts->rx_indicate_seq = (ts->rx_indicate_seq + 1) %
@@ -680,7 +680,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
680680
__func__, pReorderEntry->SeqNum);
681681
index++;
682682

683-
list_add_tail(&pReorderEntry->List,
683+
list_add_tail(&pReorderEntry->list,
684684
&ieee->RxReorder_Unused_List);
685685
} else {
686686
bPktInBuf = true;

0 commit comments

Comments
 (0)