Skip to contentSkip to conversation

staging: rtl8723bs: Remove multiple blank lines in rtw_qos.h

PATCH Superseded Pramod Maurya 3 participants 5 messages May 10 – May 11 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 staging: rtl8723bs: Remove multiple blank lines in rtw_qos.h

Remove extra blank lines that violate coding style.

---
 drivers/staging/rtl8723bs/include/rtw_qos.h | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/rtl8723bs/include/rtw_qos.h +0 -4
index 1f28837f6c27..733bfacef0b9 100644
@@ -5,15 +5,11 @@
  *
  ******************************************************************************/
 
-
 #ifndef _RTW_QOS_H_
 #define _RTW_QOS_H_
 
-
-
 struct	qos_priv {
 	unsigned int	  qos_option;	/* bit mask option: u-apsd, s-apsd, ts, block ack... */
 };
 
-
 #endif	/* _RTL871X_QOS_H_ */
Signature · 1 line
2.52.0
#1 lore raw

PATCH 2/2 staging: rtl8723bs: Fix coding style in include headers

Remove multiple blank lines and extern keywords from function prototypes in header files as flagged by checkpatch.pl.

Files changed:
- rtw_wifi_regd.h: remove multiple blank lines
- sdio_ops_linux.h: remove multiple blank lines
- cmd_osdep.h: remove multiple blank lines and extern prototypes
- rtw_ioctl_set.h: remove multiple blank lines
- rtl8192c_recv.h: remove multiple blank lines
- rtl8723b_dm.h: remove multiple blank lines

---
 drivers/staging/rtl8723bs/include/cmd_osdep.h      | 7 +++----
 drivers/staging/rtl8723bs/include/rtl8192c_recv.h  | 1 -
 drivers/staging/rtl8723bs/include/rtl8723b_dm.h    | 1 -
 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h  | 1 -
 drivers/staging/rtl8723bs/include/rtw_wifi_regd.h  | 1 -
 drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/include/cmd_osdep.h +3 -4
index 5506f513dc01..7aaee3b480ba 100644
@@ -7,12 +7,11 @@
 #ifndef __CMD_OSDEP_H_
 #define __CMD_OSDEP_H_
 
-
 int rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv);
 int rtw_init_evt_priv(struct evt_priv *pevtpriv);
-extern void _rtw_free_evt_priv(struct	evt_priv *pevtpriv);
-extern void _rtw_free_cmd_priv(struct	cmd_priv *pcmdpriv);
+void _rtw_free_evt_priv(struct	evt_priv *pevtpriv);
+void _rtw_free_cmd_priv(struct	cmd_priv *pcmdpriv);
 int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);
-extern struct	cmd_obj	*_rtw_dequeue_cmd(struct __queue *queue);
+struct	cmd_obj	*_rtw_dequeue_cmd(struct __queue *queue);
 
 #endif
drivers/staging/rtl8723bs/include/rtl8192c_recv.h +0 -1
index e2e9aa03ffdf..1f86654f0403 100644
@@ -30,7 +30,6 @@ struct phy_stat {
 /*  Rx smooth factor */
 #define	Rx_Smooth_Factor (20)
 
-
 void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status);
 void rtl8192c_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc);
 
drivers/staging/rtl8723bs/include/rtl8723b_dm.h +0 -1
index 1d2da5286e7c..50ab7aed079e 100644
@@ -29,5 +29,4 @@ void rtl8723b_HalDmWatchDog(struct adapter *padapter);
 void rtl8723b_HalDmWatchDog_in_LPS(struct adapter *padapter);
 void rtl8723b_hal_dm_in_lps(struct adapter *padapter);
 
-
 #endif
drivers/staging/rtl8723bs/include/rtw_ioctl_set.h +0 -1
index ab349de733c8..c3a1d1a84f78 100644
@@ -7,7 +7,6 @@
 #ifndef __RTW_IOCTL_SET_H_
 #define __RTW_IOCTL_SET_H_
 
-
 typedef u8 NDIS_802_11_PMKID_VALUE[16];
 
 u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_authentication_mode authmode);
drivers/staging/rtl8723bs/include/rtw_wifi_regd.h +0 -1
index e611651cb40b..e4d8fe9bf68d 100644
@@ -13,5 +13,4 @@ void rtw_regd_init(struct wiphy *wiphy,
 					struct regulatory_request *request));
 void rtw_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
 
-
 #endif
drivers/staging/rtl8723bs/include/sdio_ops_linux.h +0 -1
index 18830dd18372..cd67a7201065 100644
@@ -25,6 +25,5 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err);
 s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata);
 s32 sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata);
 
-
 void rtw_sdio_set_irq_thd(struct dvobj_priv *dvobj, void *thd_hdl);
 #endif
Signature · 1 line
2.52.0
#2 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: Fix coding style in include headers

Quoted 2 lines · Pramod Maurya

Remove multiple blank lines and extern keywords from function prototypes in header files as flagged by checkpatch.pl.

Please one patch for one logical change.

Quoted 8 lines

Files changed:
- rtw_wifi_regd.h: remove multiple blank lines
- sdio_ops_linux.h: remove multiple blank lines
- cmd_osdep.h: remove multiple blank lines and extern prototypes
- rtw_ioctl_set.h: remove multiple blank lines
- rtl8192c_recv.h: remove multiple blank lines
- rtl8723b_dm.h: remove multiple blank lines

git diff does this for you perfectly well, why repeat it?

Thanks,
Nikolay

Quoted 89 lines
---
 drivers/staging/rtl8723bs/include/cmd_osdep.h      | 7 +++----
 drivers/staging/rtl8723bs/include/rtl8192c_recv.h  | 1 -
 drivers/staging/rtl8723bs/include/rtl8723b_dm.h    | 1 -
 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h  | 1 -
 drivers/staging/rtl8723bs/include/rtw_wifi_regd.h  | 1 -
 drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/include/cmd_osdep.h +3 -4
index 5506f513dc01..7aaee3b480ba 100644
@@ -7,12 +7,11 @@
 #ifndef __CMD_OSDEP_H_
 #define __CMD_OSDEP_H_
 
-
 int rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv);
 int rtw_init_evt_priv(struct evt_priv *pevtpriv);
-extern void _rtw_free_evt_priv(struct	evt_priv *pevtpriv);
-extern void _rtw_free_cmd_priv(struct	cmd_priv *pcmdpriv);
+void _rtw_free_evt_priv(struct	evt_priv *pevtpriv);
+void _rtw_free_cmd_priv(struct	cmd_priv *pcmdpriv);
 int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);
-extern struct	cmd_obj	*_rtw_dequeue_cmd(struct __queue *queue);
+struct	cmd_obj	*_rtw_dequeue_cmd(struct __queue *queue);
 
 #endif
drivers/staging/rtl8723bs/include/rtl8192c_recv.h +0 -1
index e2e9aa03ffdf..1f86654f0403 100644
@@ -30,7 +30,6 @@ struct phy_stat {
 /*  Rx smooth factor */
 #define	Rx_Smooth_Factor (20)
 
-
 void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status);
 void rtl8192c_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc);
 
drivers/staging/rtl8723bs/include/rtl8723b_dm.h +0 -1
index 1d2da5286e7c..50ab7aed079e 100644
@@ -29,5 +29,4 @@ void rtl8723b_HalDmWatchDog(struct adapter *padapter);
 void rtl8723b_HalDmWatchDog_in_LPS(struct adapter *padapter);
 void rtl8723b_hal_dm_in_lps(struct adapter *padapter);
 
-
 #endif
drivers/staging/rtl8723bs/include/rtw_ioctl_set.h +0 -1
index ab349de733c8..c3a1d1a84f78 100644
@@ -7,7 +7,6 @@
 #ifndef __RTW_IOCTL_SET_H_
 #define __RTW_IOCTL_SET_H_
 
-
 typedef u8 NDIS_802_11_PMKID_VALUE[16];
 
 u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_authentication_mode authmode);
drivers/staging/rtl8723bs/include/rtw_wifi_regd.h +0 -1
index e611651cb40b..e4d8fe9bf68d 100644
@@ -13,5 +13,4 @@ void rtw_regd_init(struct wiphy *wiphy,
 					struct regulatory_request *request));
 void rtw_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
 
-
 #endif
drivers/staging/rtl8723bs/include/sdio_ops_linux.h +0 -1
index 18830dd18372..cd67a7201065 100644
@@ -25,6 +25,5 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err);
 s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata);
 s32 sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata);
 
-
 void rtw_sdio_set_irq_thd(struct dvobj_priv *dvobj, void *thd_hdl);
 #endif
Signature · 1 line
2.52.0
#3 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: Fix coding style in include headers

Quoted 16 lines · Nikolay Kulikov
Quoted 2 lines · Pramod Maurya

Remove multiple blank lines and extern keywords from function prototypes in header files as flagged by checkpatch.pl.

Please one patch for one logical change.

Quoted 8 lines

Files changed:
- rtw_wifi_regd.h: remove multiple blank lines
- sdio_ops_linux.h: remove multiple blank lines
- cmd_osdep.h: remove multiple blank lines and extern prototypes
- rtw_ioctl_set.h: remove multiple blank lines
- rtl8192c_recv.h: remove multiple blank lines
- rtl8723b_dm.h: remove multiple blank lines

Quoted 1 line

git diff does this for you perfectly well, why repeat it?

And you haven't added cover-letter (PATCH 0/2), you can do this with:

	$ git format-patch --cover-letter ...
Quoted 4 lines

Thanks,
Nikolay

maintainer
#4 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: Fix coding style in include headers

In reply to Pramod Maurya
Quoted 7 lines · Pramod Maurya

Remove multiple blank lines and extern keywords from function prototypes in header files as flagged by checkpatch.pl.

Files changed:
- rtw_wifi_regd.h: remove multiple blank lines
- sdio_ops_linux.h: remove multiple blank lines
- cmd_osdep.h: remove multiple blank lines and extern prototypes

That is 2 different logical things in the same change, just do the extern one in a different patch.

thanks,

greg k-h