Staging: rtl8712: drv_types.h:Coding style warnings fix for block comments
PATCH 1/11 Staging: rtl8712: drv_types.h:Coding style warnings fix for block comments
This is patch to the drv_types.h file that fixes up following warning reported by checkpatch.pl :
-Block comments use * on subsequent lines -Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/drv_types.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/staging/rtl8712/drv_types.h +6 -5
@@ -23,11 +23,12 @@* Larry Finger <[email protected]> * ******************************************************************************/ -/*--------------------------------------------------------------------- - -For type defines and data structure defines - ------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------- +* +* For type defines and data structure defines +* +* --------------------------------------------------------------------- +*/ #ifndef __DRV_TYPES_H__#define __DRV_TYPES_H__
Signature · 1 line
2.5.3
PATCH 2/11 Staging: rtl8712: hal_init.c: Coding style warnings fix for block comments
This is patch to the hal_init.c file that fixes up following warning reported by checkpatch.pl :
-Block comments use * on subsequent lines -Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/hal_init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/hal_init.c +8 -4
@@ -297,7 +297,8 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter) tmp8 =r8712_read8 (padapter,0x1025000A );if (tmp8 &BIT (4 ))/* When boot from EEPROM, -& FW need more time to read EEPROM */ +* & FW need more time to read EEPROM +*/ i =60 ;else /* boot from EFUSE */ i =30 ;
@@ -331,7 +332,8 @@ uint rtl8712_hal_init(struct _adapter *padapter) r8712_read32(padapter, RCR)); val32 =r8712_read32 (padapter,RCR );r8712_write32 (padapter,RCR , (val32 |BIT (26 )));/* Enable RX TCP -Checksum offload */ +* Checksum offload +*/ netdev_info (padapter->pnetdev,"2 RCR=0x%x\n" ,r8712_read32 (padapter,RCR )); val32 =r8712_read32 (padapter,RCR );
@@ -345,7 +347,8 @@ uint rtl8712_hal_init(struct _adapter *padapter)r8712_write8 (padapter,0x102500BD ,r8712_read8 (padapter,0x102500BD ) |BIT (7 ));/* enable usb rx aggregation */ r8712_write8 (padapter,0x102500D9 ,1 );/* TH=1 => means that invalidate -* usb rx aggregation */ +* usb rx aggregation +*/ r8712_write8 (padapter,0x1025FE5B ,0x04 );/* 1.7ms/4 */ /* Fix the RX FIFO issue(USB error) */ r8712_write8(padapter, 0x1025fe5C, r8712_read8(padapter, 0x1025fe5C)
@@ -366,7 +369,8 @@ uint rtl8712_hal_deinit(struct _adapter *padapter)r8712_write8 (padapter,SYS_FUNC_EN +1 ,0x70 );r8712_write8 (padapter,PMC_FSM ,0x06 );/* Enable Loader Data Keep */ r8712_write8 (padapter,SYS_ISO_CTRL ,0xF9 );/* Isolation signals from -* CORE, PLL */ +* CORE, PLL +*/ r8712_write8 (padapter,SYS_ISO_CTRL +1 ,0xe8 );/* Enable EFUSE 1.2V */ r8712_write8 (padapter,AFE_PLL_CTRL ,0x00 );/* Disable AFE PLL. */ r8712_write8 (padapter,LDOA15_CTRL ,0x54 );/* Disable A15V */
Signature · 1 line
2.5.3
PATCH 3/11 Staging: rtl8712: ieee80211.c: Coding style warnings fix for block comments
In reply to Punit VaraThis is patch to the ieee80211.c file that fixes up following warning reported by checkpatch.pl :
-Block comments use * on subsequent lines -Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/ieee80211.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/rtl8712/ieee80211.c +4 -3
@@ -107,9 +107,10 @@ u8 *r8712_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen)return pbuf + len +2 ; } -/*---------------------------------------------------------------------------- -index: the information element id index, limit is the limit for search ------------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------- +* index: the information element id index, limit is the limit for search +* --------------------------------------------------------------------------- +*/ u8 *r8712_get_ie (u8 *pbuf,sint index,sint *len,sint limit) {sint tmp, i;
Signature · 1 line
2.5.3
PATCH 4/11 Staging: rtl8712: ieee80211.h: Coding style warnings fix for block comments
In reply to Punit VaraThis is patch to the ieee80211.h file that fixes up following warning reported by checkpatch.pl :
-Block comments use * on subsequent lines -Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/ieee80211.h | 48 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 22 deletions(-)
drivers/staging/rtl8712/ieee80211.h +26 -22
@@ -120,12 +120,13 @@ struct ieee_param {#define IEEE80211_DATA_LEN 2304/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section -6.2.1.1.2. - -The figure in section 7.1.2 suggests a body size of up to 2312 -bytes is allowed, which is a bit confusing, I suspect this -represents the 2304 bytes of real data, plus a possible 8 bytes of -WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */ +* 6.2.1.1.2. +* +* The figure in section 7.1.2 suggests a body size of up to 2312 +* bytes is allowed, which is a bit confusing, I suspect this +* represents the 2304 bytes of real data, plus a possible 8 bytes of +* WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) +*/ #define IEEE80211_HLEN 30#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN)
@@ -405,7 +406,8 @@ struct ieee80211_snap_hdr {/* NOTE: This data is for statistical purposes; not all hardware provides this * information for frames received. Not setting these will not cause -* any adverse affects. */ +* any adverse affects. +*/ struct ieee80211_rx_stats {s8 rssi;u8 signal;
@@ -420,7 +422,8 @@ struct ieee80211_rx_stats {/* IEEE 802.11 requires that STA supports concurrent reception of at least * three fragmented frames. This define can be increased to support more * concurrent frames, but it should be noted that each entry can consume about -* 2 kB of RAM and increasing cache size will slow down frame reassembly. */ +* 2 kB of RAM and increasing cache size will slow down frame reassembly. +*/ #define IEEE80211_FRAG_CACHE_LEN 4struct ieee80211_frag_entry {
@@ -510,19 +513,19 @@ struct ieee80211_security { } __packed;/* - -802.11 data frame from AP - -,-------------------------------------------------------------------. -Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | -|------|------|---------|---------|---------|------|---------|------| -Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | frame | fcs | -| | tion | (BSSID) | | | ence | data | | -`-------------------------------------------------------------------' - -Total: 28-2340 bytes - -*/ +* +* 802.11 data frame from AP +* +* ,-------------------------------------------------------------------. +* Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | +* |------|------|---------|---------|---------|------|---------|------| +* Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | frame | fcs | +* | | tion | (BSSID) | | | ence | data | | +* `-------------------------------------------------------------------' +* +* Total: 28-2340 bytes +* +*/ struct ieee80211_header_data {u16 frame_ctl;
@@ -628,7 +631,8 @@ struct ieee80211_txb {/* MAX_RATES_LENGTH needs to be 12. The spec says 8, and many APs * only use 8, and then use extended rates for the remaining supported * rates. Other APs, however, stick all of their supported rates on the -* main rates information element... */ +* main rates information element... +*/ #define MAX_RATES_LENGTH ((u8)12)#define MAX_RATES_EX_LENGTH ((u8)16)#define MAX_NETWORK_COUNT 128
Signature · 1 line
2.5.3
PATCH 5/11 Staging: rtl8712: mlme_linux.c: Coding style warnings fix for block comments
In reply to Punit VaraThis is patch to the mlme_linux.c file that fixes up following warning reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/mlme_linux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8712/mlme_linux.c +2 -1
@@ -122,7 +122,8 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter) r8712_use_tkipkey_handler, (unsigned long)adapter);/* Restore the PMK information to securitypriv structure -* for the following connection. */ +* for the following connection. +*/ memcpy (&adapter->securitypriv.PMKIDList[0 ], &backupPMKIDList[0 ],sizeof (struct RT_PMKID_LIST ) *NUM_PMKID_CACHE );
Signature · 1 line
2.5.3
PATCH 6/11 Staging: rtl8712: os_intfs.c : Coding style warning fix for block comment
In reply to Punit VaraThis is patch to the os_intfs.c file that fixes up following warning reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/os_intfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8712/os_intfs.c +2 -1
@@ -366,7 +366,8 @@ static void enable_video_mode(struct _adapter *padapter, int cbw40_value)if (cbw40_value) {/* if the driver supports the 40M bandwidth, -* we can enable the bit 9.*/ +* we can enable the bit 9. +*/ intcmd |=0x200 ; }r8712_fw_cmd (padapter, intcmd);
Signature · 1 line
2.5.3
PATCH 7/11 Staging: rtl8712: recv_linux.c: Coding style warning fix for block comment
In reply to Punit VaraThis is patch to the recv_linux.c file that fixes up following warning reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/recv_linux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8712/recv_linux.c +2 -1
@@ -127,7 +127,8 @@ void r8712_recv_indicatepkt(struct _adapter *padapter, skb->protocol =eth_type_trans (skb, padapter->pnetdev);netif_rx (skb); precv_frame->u.hdr.pkt =NULL ;/* pointers to NULL before -* r8712_free_recvframe() */ +* r8712_free_recvframe() +*/ r8712_free_recvframe (precv_frame, pfree_recv_queue);return ; _recv_indicatepkt_drop:
Signature · 1 line
2.5.3
PATCH 8/11 Staging: rtl8712: rtl8712_cmd.c: Coding style warnings fix for block comments
In reply to Punit VaraThis is patch to the rtl8712_cmd.c file that fixes up following warning reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/rtl8712_cmd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/rtl8712_cmd.c +8 -4
@@ -64,10 +64,12 @@ static void check_hw_pbc(struct _adapter *padapter)return ;if (tmp1byte&HAL_8192S_HW_GPIO_WPS_BIT ) {/* Here we only set bPbcPressed to true -* After trigger PBC, the variable will be set to false */ +* After trigger PBC, the variable will be set to false +*/ DBG_8712 ("CheckPbcGPIO - PBC is pressed !!!!\n" );/* 0 is the default value and it means the application monitors -* the HW PBC doesn't provide its pid to driver. */ +* the HW PBC doesn't provide its pid to driver. +*/ if (padapter->pid ==0 )return ;kill_pid (find_vpid (padapter->pid),SIGUSR1 ,1 );
@@ -76,7 +78,8 @@ static void check_hw_pbc(struct _adapter *padapter)/* query rx phy status from fw. * Adhoc mode: beacon. -* Infrastructure mode: beacon , data. */ +* Infrastructure mode: beacon , data. +*/ static void query_fw_rx_phy_status (struct _adapter *padapter) {u32 val32 =0 ;
@@ -257,7 +260,8 @@ static struct cmd_obj *cmd_hdl_filter(struct _adapter *padapter,/* Before set JoinBss_CMD to FW, driver must ensure FW is in * PS_MODE_ACTIVE. Directly write rpwm to radio on and assign * new pwr_mode to Driver, instead of use workitem to change -* state. */ +* state. +*/ if (padapter->pwrctrlpriv.pwr_mode >PS_MODE_ACTIVE ) { padapter->pwrctrlpriv.pwr_mode =PS_MODE_ACTIVE ;_enter_pwrlock (&(padapter->pwrctrlpriv.lock));
Signature · 1 line
2.5.3
PATCH 9/11 Staging: rtl8712: rtl8712_cmdctrl_bitdef.h: Coding style warning fix for block comment
In reply to Punit VaraThis is patch to the rtl8712_cmdctrl_bitdef.h file that fixes up following
warning reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h +2 -1
@@ -21,7 +21,8 @@#define __RTL8712_CMDCTRL_BITDEF_H__/* -* 2. Command Control Registers (Offset: 0x0040 - 0x004F)*/ +* 2. Command Control Registers (Offset: 0x0040 - 0x004F) +*/ /*--------------------------------------------------------------------------*/ /* 8192S (CMD) command register bits (Offset 0x40, 16 bits)*/ /*--------------------------------------------------------------------------*/
Signature · 1 line
2.5.3
PATCH 10/11 Staging: rtl8712: rtl8712_gp_bitdef.h: Coding style warning fix for block comment
In reply to Punit VaraThis is patch to the rtl8712_gp_bitdef.h file that fixes up following
warning reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8712/rtl8712_gp_bitdef.h +2 -1
@@ -64,7 +64,8 @@#define GPIOMUX_EN BIT(3)/* When this bit is set to "1", * GPIO PINs will switch to MAC -* GPIO Function*/ +* GPIO Function +*/ #define GPIOSEL_GPIO 0/* UART or JTAG or pure GPIO*/ #define GPIOSEL_PHYDBG 1/* PHYDBG*/ #define GPIOSEL_BT 2/* BT_coex*/
Signature · 1 line
2.5.3
PATCH 11/11 Staging: rtl8712: rtl8712_hal.h: Coding style warnings fix for block comments
In reply to Punit VaraThis is patch to the rtl8712_hal.h file that fixes up following warning reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
--- drivers/staging/rtl8712/rtl8712_hal.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/staging/rtl8712/rtl8712_hal.h +9 -5
@@ -68,12 +68,14 @@ struct fw_priv { /*8-bytes alignment required*/unsigned char signature_0;/*0x12: CE product, 0x92: IT product*/ unsigned char signature_1;/*0x87: CE product, 0x81: IT product*/ unsigned char hci_sel;/*0x81: PCI-AP, 01:PCIe, 02: 92S-U, 0x82: USB-AP, -* 0x12: 72S-U, 03:SDIO*/ +* 0x12: 72S-U, 03:SDIO +*/ unsigned char chip_version;/*the same value as register value*/ unsigned char customer_ID_0;/*customer ID low byte*/ unsigned char customer_ID_1;/*customer ID high byte*/ unsigned char rf_config;/*0x11: 1T1R, 0x12: 1T2R, 0x92: 1T2R turbo, -* 0x22: 2T2R*/ +* 0x22: 2T2R +*/ unsigned char usb_ep_num;/* 4: 4EP, 6: 6EP, 11: 11EP*/ /*--- long word 1 ----*/ unsigned char regulatory_class_0;/*regulatory class bit map 0*/
@@ -97,7 +99,8 @@ struct fw_priv { /*8-bytes alignment required*/unsigned char qos_en;/*1: QoS enable*/ unsigned char bw_40MHz_en;/*1: 40MHz BW enable*/ unsigned char AMSDU2AMPDU_en;/*1: 4181 convert AMSDU to AMPDU, -* 0: disable*/ +* 0: disable +*/ unsigned char AMPDU_en;/*1: 11n AMPDU enable*/ unsigned char rate_control_offload;/*1: FW offloads,0: driver handles*/ unsigned char aggregation_offload;/*1: FW offloads,0: driver handles*/
@@ -125,8 +128,9 @@ struct fw_priv { /*8-bytes alignment required*/struct fw_hdr {/*8-byte alignment required*/ unsigned short signature; -unsigned short version;/*0x8000 ~ 0x8FFF for FPGA version, -*0x0000 ~ 0x7FFF for ASIC version,*/ +unsigned short version;/* 0x8000 ~ 0x8FFF for FPGA version, +* 0x0000 ~ 0x7FFF for ASIC version, +*/ unsigned int dmem_size;/*define the size of boot loader*/ unsigned int img_IMEM_size;/*define the size of FW in IMEM*/ unsigned int img_SRAM_size;/*define the size of FW in SRAM*/
Signature · 1 line
2.5.3