Skip to content

Commit 18ac97e

Browse files
Arthur-St-06gregkh
authored andcommitted
staging: rtl8723bs: core: fix block comment style issues
Fix the following checkpatch warnings for block comments: * Block comments should align the * on each line * Block comments use * on subsequent lines * Block comments use a trailing */ on a separate line No functional changes. Signed-off-by: Artur Stupa <arthur.stupa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/20251121224143.33701-1-arthur.stupa@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 706cc5a commit 18ac97e

7 files changed

Lines changed: 128 additions & 172 deletions

File tree

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ u8 *rtw_set_ie(u8 *pbuf,
132132
return pbuf + len + 2;
133133
}
134134

135-
/*----------------------------------------------------------------------------
136-
index: the information element id index, limit is the limit for search
137-
-----------------------------------------------------------------------------*/
135+
/* index: the information element id index, limit is the limit for search */
138136
u8 *rtw_get_ie(u8 *pbuf, signed int index, signed int *len, signed int limit)
139137
{
140138
signed int tmp, i;
@@ -767,21 +765,27 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
767765
{
768766
unsigned int oui;
769767

770-
/* first 3 bytes in vendor specific information element are the IEEE
768+
/*
769+
* first 3 bytes in vendor specific information element are the IEEE
771770
* OUI of the vendor. The following byte is used a vendor specific
772-
* sub-type. */
771+
* sub-type.
772+
*/
773773
if (elen < 4)
774774
return -1;
775775

776776
oui = get_unaligned_be24(pos);
777777
switch (oui) {
778778
case OUI_MICROSOFT:
779-
/* Microsoft/Wi-Fi information elements are further typed and
780-
* subtyped */
779+
/*
780+
* Microsoft/Wi-Fi information elements are further typed and
781+
* subtyped
782+
*/
781783
switch (pos[3]) {
782784
case 1:
783-
/* Microsoft OUI (00:50:F2) with OUI Type 1:
784-
* real WPA information element */
785+
/*
786+
* Microsoft OUI (00:50:F2) with OUI Type 1:
787+
* real WPA information element
788+
*/
785789
elems->wpa_ie = pos;
786790
elems->wpa_ie_len = elen;
787791
break;

drivers/staging/rtl8723bs/core/rtw_io.c

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,23 @@
55
*
66
******************************************************************************/
77
/*
8-
9-
The purpose of rtw_io.c
10-
11-
a. provides the API
12-
13-
b. provides the protocol engine
14-
15-
c. provides the software interface between caller and the hardware interface
16-
17-
18-
Compiler Flag Option:
19-
20-
1. CONFIG_SDIO_HCI:
21-
a. USE_SYNC_IRP: Only sync operations are provided.
22-
b. USE_ASYNC_IRP:Both sync/async operations are provided.
23-
24-
jackson@realtek.com.tw
25-
26-
*/
8+
* The purpose of rtw_io.c
9+
*
10+
* a. provides the API
11+
*
12+
* b. provides the protocol engine
13+
*
14+
* c. provides the software interface between caller and the hardware interface
15+
*
16+
*
17+
* Compiler Flag Option:
18+
*
19+
* 1. CONFIG_SDIO_HCI:
20+
* a. USE_SYNC_IRP: Only sync operations are provided.
21+
* b. USE_ASYNC_IRP:Both sync/async operations are provided.
22+
*
23+
* jackson@realtek.com.tw
24+
*/
2725

2826
#include <drv_types.h>
2927

@@ -135,10 +133,10 @@ int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct adapt
135133
}
136134

137135
/*
138-
* Increase and check if the continual_io_error of this @param dvobjprive is larger than MAX_CONTINUAL_IO_ERR
139-
* @return true:
140-
* @return false:
141-
*/
136+
* Increase and check if the continual_io_error of this @param dvobjprive is larger than MAX_CONTINUAL_IO_ERR
137+
* @return true:
138+
* @return false:
139+
*/
142140
int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)
143141
{
144142
int error_count = atomic_inc_return(&dvobj->continual_io_error);
@@ -149,9 +147,7 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)
149147
return false;
150148
}
151149

152-
/*
153-
* Set the continual_io_error of this @param dvobjprive to 0
154-
*/
150+
/* Set the continual_io_error of this @param dvobjprive to 0 */
155151
void rtw_reset_continual_io_error(struct dvobj_priv *dvobj)
156152
{
157153
atomic_set(&dvobj->continual_io_error, 0);

drivers/staging/rtl8723bs/core/rtw_mlme.c

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *
214214
}
215215

216216
/*
217-
return the wlan_network with the matching addr
218-
219-
Shall be called under atomic context... to avoid possible racing condition...
220-
*/
217+
* return the wlan_network with the matching addr
218+
*
219+
* Shall be called under atomic context... to avoid possible racing condition...
220+
*/
221221
struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
222222
{
223223
struct list_head *phead, *plist;
@@ -319,10 +319,10 @@ void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnet
319319
}
320320

321321
/*
322-
return the wlan_network with the matching addr
323-
324-
Shall be called under atomic context... to avoid possible racing condition...
325-
*/
322+
* return the wlan_network with the matching addr
323+
*
324+
* Shall be called under atomic context... to avoid possible racing condition...
325+
*/
326326
struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
327327
{
328328
struct wlan_network *pnetwork = _rtw_find_network(scanned_queue, addr);
@@ -476,9 +476,7 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
476476
}
477477
}
478478

479-
/*
480-
Caller must hold pmlmepriv->lock first.
481-
*/
479+
/* Caller must hold pmlmepriv->lock first. */
482480
void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target)
483481
{
484482
struct list_head *plist, *phead;
@@ -510,8 +508,10 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
510508
oldest = pnetwork;
511509
}
512510

513-
/* If we didn't find a match, then get a new network slot to initialize
514-
* with this beacon's information */
511+
/*
512+
* If we didn't find a match, then get a new network slot to initialize
513+
* with this beacon's information
514+
*/
515515
if (!target_find) {
516516
if (list_empty(&pmlmepriv->free_bss_pool.queue)) {
517517
/* If there are no more slots, expire the oldest */
@@ -843,9 +843,7 @@ static void find_network(struct adapter *adapter)
843843
rtw_free_network_nolock(adapter, pwlan);
844844
}
845845

846-
/*
847-
*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock
848-
*/
846+
/* rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock */
849847
void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
850848
{
851849
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@@ -879,9 +877,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
879877
rtw_reset_rx_info(pdbgpriv);
880878
}
881879

882-
/*
883-
*rtw_indicate_connect: the caller has to lock pmlmepriv->lock
884-
*/
880+
/* rtw_indicate_connect: the caller has to lock pmlmepriv->lock */
885881
void rtw_indicate_connect(struct adapter *padapter)
886882
{
887883
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -908,9 +904,7 @@ void rtw_indicate_connect(struct adapter *padapter)
908904
rtw_set_scan_deny(padapter, 3000);
909905
}
910906

911-
/*
912-
*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock
913-
*/
907+
/* rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock */
914908
void rtw_indicate_disconnect(struct adapter *padapter)
915909
{
916910
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -1543,9 +1537,9 @@ void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf)
15431537
}
15441538

15451539
/*
1546-
* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss
1547-
* @adapter: pointer to struct adapter structure
1548-
*/
1540+
* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss
1541+
* @adapter: pointer to struct adapter structure
1542+
*/
15491543
void _rtw_join_timeout_handler(struct timer_list *t)
15501544
{
15511545
struct adapter *adapter = timer_container_of(adapter, t,
@@ -1586,9 +1580,9 @@ void _rtw_join_timeout_handler(struct timer_list *t)
15861580
}
15871581

15881582
/*
1589-
* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey
1590-
* @adapter: pointer to struct adapter structure
1591-
*/
1583+
* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey
1584+
* @adapter: pointer to struct adapter structure
1585+
*/
15921586
void rtw_scan_timeout_handler(struct timer_list *t)
15931587
{
15941588
struct adapter *adapter = timer_container_of(adapter, t,
@@ -1704,10 +1698,10 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms)
17041698
}
17051699

17061700
/*
1707-
* Select a new roaming candidate from the original @param candidate and @param competitor
1708-
* @return true: candidate is updated
1709-
* @return false: candidate is not updated
1710-
*/
1701+
* Select a new roaming candidate from the original @param candidate and @param competitor
1702+
* @return true: candidate is updated
1703+
* @return false: candidate is not updated
1704+
*/
17111705
static int rtw_check_roaming_candidate(struct mlme_priv *mlme
17121706
, struct wlan_network **candidate, struct wlan_network *competitor)
17131707
{
@@ -1785,10 +1779,10 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)
17851779
}
17861780

17871781
/*
1788-
* Select a new join candidate from the original @param candidate and @param competitor
1789-
* @return true: candidate is updated
1790-
* @return false: candidate is not updated
1791-
*/
1782+
* Select a new join candidate from the original @param candidate and @param competitor
1783+
* @return true: candidate is updated
1784+
* @return false: candidate is not updated
1785+
*/
17921786
static int rtw_check_join_candidate(struct mlme_priv *mlme
17931787
, struct wlan_network **candidate, struct wlan_network *competitor)
17941788
{
@@ -1829,11 +1823,11 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
18291823
}
18301824

18311825
/*
1832-
Calling context:
1833-
The caller of the sub-routine will be in critical section...
1834-
The caller must hold the following spinlock
1835-
pmlmepriv->lock
1836-
*/
1826+
* Calling context:
1827+
* The caller of the sub-routine will be in critical section...
1828+
* The caller must hold the following spinlock
1829+
* pmlmepriv->lock
1830+
*/
18371831

18381832
int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
18391833
{

0 commit comments

Comments
 (0)