Staging: rtl8712: Addressed checkpatch.pl issues related to macro parameter wrapping in parentheses.
PATCH v2 1/1 Staging: rtl8712: Addressed checkpatch.pl issues related to macro parameter wrapping in parentheses.
Attempting to wet my feet in kernel patch submission by submitting a checkstyle fix for the rtl8712 driver.
--- drivers/staging/rtl8712/basic_types.h | 2 +- drivers/staging/rtl8712/osdep_intf.h | 2 +- drivers/staging/rtl8712/rtl8712_efuse.h | 8 ++++---- drivers/staging/rtl8712/rtl8712_recv.h | 4 ++-- drivers/staging/rtl8712/rtl871x_xmit.h | 6 +++--- drivers/staging/rtl8712/wifi.h | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/rtl8712/basic_types.h +1 -1
@@ -21,7 +21,7 @@#define SIZE_T __kernel_size_t#define sint signed int -#define FIELD_OFFSET (s, field) ((addr_t)&((s *)(0))->field) +#define FIELD_OFFSET (s, field) ((addr_t)&(((s) *)(0))->(field))/* Should we extend this to be host_addr_t and target_addr_t for case: * host : x86_64
drivers/staging/rtl8712/osdep_intf.h +1 -1
@@ -17,7 +17,7 @@#include "osdep_service.h" #include "drv_types.h" -#define RND4 (x) (((x >> 2) + (((x & 3) == 0) ? 0 : 1)) << 2) +#define RND4 (x) ((((x) >> 2) + ((((x) & 3) == 0) ? 0 : 1)) << 2)struct intf_priv {u8 *intf_dev;
drivers/staging/rtl8712/rtl8712_efuse.h +4 -4
@@ -13,10 +13,10 @@#define PGPKT_DATA_SIZE 8/* PGPKG_MAX_WORDS*2; BYTES sizeof(u8)*8*/ #define MAX_PGPKT_SIZE 9/* 1 + PGPKT_DATA_SIZE; header + 2 * 4 words (BYTES)*/ -#define GET_EFUSE_OFFSET (header) ((header & 0xF0) >> 4) -#define GET_EFUSE_WORD_EN (header) (header & 0x0F) -#define MAKE_EFUSE_HEADER (offset, word_en) (((offset & 0x0F) << 4) | \ - (word_en & 0x0F)) +#define GET_EFUSE_OFFSET (header) (((header) & 0xF0) >> 4) +#define GET_EFUSE_WORD_EN (header) ((header) & 0x0F) +#define MAKE_EFUSE_HEADER (offset, word_en) ((((offset) & 0x0F) << 4) | \ + ((word_en) & 0x0F))/*--------------------------------------------------------------------------*/ struct PGPKT_STRUCT {u8 offset;
drivers/staging/rtl8712/rtl8712_recv.h +2 -2
@@ -33,8 +33,8 @@#define RECVBUFF_ALIGN_SZ 512#define RSVD_ROOM_SZ (0)/*These definition is used for Rx packet reordering.*/ -#define SN_LESS (a, b) (((a-b) & 0x800) != 0) -#define SN_EQUAL (a, b) (a == b) +#define SN_LESS (a, b) ((((a)-(b)) & 0x800) != 0) +#define SN_EQUAL (a, b) ((a) == (b))#define REORDER_WAIT_TIME 30/* (ms)*/ struct recv_stat {
drivers/staging/rtl8712/rtl871x_xmit.h +3 -3
@@ -41,7 +41,7 @@ do { \ pattrib_iv[0 ] = txpn._byte_.TSC0;\ pattrib_iv[1 ] = txpn._byte_.TSC1;\ pattrib_iv[2 ] = txpn._byte_.TSC2;\ - pattrib_iv[3 ] = ((keyidx &0x3 ) <<6 );\ + pattrib_iv[3 ] = (((keyidx) &0x3 ) <<6 );\ txpn.val = (txpn.val ==0xffffff ) ?0 : (txpn.val+1 );\ }while (0 )
@@ -53,7 +53,7 @@ do { \ pattrib_iv[0 ] = txpn._byte_.TSC1;\ pattrib_iv[1 ] = (txpn._byte_.TSC1 |0x20 ) &0x7f ;\ pattrib_iv[2 ] = txpn._byte_.TSC0;\ - pattrib_iv[3 ] =BIT (5 ) | ((keyidx &0x3 )<<6 );\ + pattrib_iv[3 ] =BIT (5 ) | (((keyidx) &0x3 )<<6 );\ pattrib_iv[4 ] = txpn._byte_.TSC2;\ pattrib_iv[5 ] = txpn._byte_.TSC3;\ pattrib_iv[6 ] = txpn._byte_.TSC4;\
@@ -67,7 +67,7 @@ do { \ pattrib_iv[0 ] = txpn._byte_.TSC0;\ pattrib_iv[1 ] = txpn._byte_.TSC1;\ pattrib_iv[2 ] =0 ;\ - pattrib_iv[3 ] =BIT (5 ) | ((keyidx &0x3 )<<6 );\ + pattrib_iv[3 ] =BIT (5 ) | (((keyidx) &0x3 )<<6 );\ pattrib_iv[4 ] = txpn._byte_.TSC2;\ pattrib_iv[5 ] = txpn._byte_.TSC3;\ pattrib_iv[6 ] = txpn._byte_.TSC4;\
drivers/staging/rtl8712/wifi.h +3 -3
@@ -245,7 +245,7 @@ static inline unsigned char get_tofr_ds(unsigned char *pframe)#define SetSeqNum (pbuf, num) ({ \ *(__le16 *)((addr_t)(pbuf) + 22) = \ cpu_to_le16((le16_to_cpu(*(__le16 *)((addr_t)(pbuf) + 22)) & \ - 0x000f) | (0xfff0 & (num << 4))); \ + 0x000f) | (0xfff0 & ((num) << 4))); \ })#define SetDuration (pbuf, dur) ({ \
@@ -254,13 +254,13 @@ static inline unsigned char get_tofr_ds(unsigned char *pframe) })#define SetPriority (pbuf, tid) ({ \ - *(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf); \ + *(__le16 *)(pbuf) |= cpu_to_le16((tid) & 0xf); \ })#define GetPriority (pbuf) ((le16_to_cpu(*(__le16 *)(pbuf))) & 0xf)#define SetAckpolicy (pbuf, ack) ({ \ - *(__le16 *)(pbuf) |= cpu_to_le16((ack & 3) << 5); \ + *(__le16 *)(pbuf) |= cpu_to_le16(((ack) & 3) << 5); \ })#define GetAckpolicy (pbuf) (((le16_to_cpu(*(__le16 *)pbuf)) >> 5) & 0x3)
Signature · 1 line
2.20.1
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Ricardo,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on staging/staging-testing]
url: https://github.com/0day-ci/linux/commits/Ricardo-Ferreira/Staging-rtl8712-Addressed-checkpatch-pl-issues-related-to-macro-parameter-wrapping-in-parentheses/20200615-013306 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git af7b4801030c07637840191c69eb666917e4135d config: arm-randconfig-r025-20200614 (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>, old ones prefixed by <<):
In file included from drivers/staging/rtl8712/rtl871x_cmd.h:22,
from drivers/staging/rtl8712/drv_types.h:47,
from drivers/staging/rtl8712/hal_init.c:26:drivers/staging/rtl8712/ieee80211.h:566:1: warning: alignment 1 of 'struct ieee80211_authentication' is less than 2 [-Wpacked-not-aligned] 566 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:574:1: warning: alignment 1 of 'struct ieee80211_probe_response' is less than 2 [-Wpacked-not-aligned] 574 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:578:1: warning: alignment 1 of 'struct ieee80211_probe_request' is less than 2 [-Wpacked-not-aligned] 578 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:585:1: warning: alignment 1 of 'struct ieee80211_assoc_request_frame' is less than 2 [-Wpacked-not-aligned] 585 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:592:1: warning: alignment 1 of 'struct ieee80211_assoc_response_frame' is less than 2 [-Wpacked-not-aligned] 592 | } __packed;
| ^
In file included from drivers/staging/rtl8712/osdep_service.h:31,
from drivers/staging/rtl8712/hal_init.c:25:drivers/staging/rtl8712/hal_init.c: In function 'chk_fwhdr':
>> drivers/staging/rtl8712/basic_types.h:24:49: error: expected expression before ')' token 24 | #define FIELD_OFFSET(s, field) ((addr_t)&(((s) *)(0))->(field)) | ^ >> drivers/staging/rtl8712/hal_init.c:136:12: note: in expansion of macro 'FIELD_OFFSET' 136 | fwhdrsz = FIELD_OFFSET(struct fw_hdr, fwpriv) + pfwhdr->fw_priv_sz; | ^~~~~~~~~~~~ drivers/staging/rtl8712/hal_init.c: In function 'rtl8712_dl_fw': >> drivers/staging/rtl8712/basic_types.h:24:49: error: expected expression before ')' token
24 | #define FIELD_OFFSET(s, field) ((addr_t)&(((s) *)(0))->(field))
| ^drivers/staging/rtl8712/hal_init.c:176:26: note: in expansion of macro 'FIELD_OFFSET'
176 | ptr = (u8 *)mappedfw + FIELD_OFFSET(struct fw_hdr, fwpriv) +
| ^~~~~~~~~~~~
--
In file included from drivers/staging/rtl8712/rtl871x_cmd.h:22,
from drivers/staging/rtl8712/drv_types.h:47,
from drivers/staging/rtl8712/rtl871x_ioctl_linux.c:21:drivers/staging/rtl8712/ieee80211.h:566:1: warning: alignment 1 of 'struct ieee80211_authentication' is less than 2 [-Wpacked-not-aligned] 566 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:574:1: warning: alignment 1 of 'struct ieee80211_probe_response' is less than 2 [-Wpacked-not-aligned] 574 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:578:1: warning: alignment 1 of 'struct ieee80211_probe_request' is less than 2 [-Wpacked-not-aligned] 578 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:585:1: warning: alignment 1 of 'struct ieee80211_assoc_request_frame' is less than 2 [-Wpacked-not-aligned] 585 | } __packed;
| ^drivers/staging/rtl8712/ieee80211.h:592:1: warning: alignment 1 of 'struct ieee80211_assoc_response_frame' is less than 2 [-Wpacked-not-aligned] 592 | } __packed;
| ^
In file included from drivers/staging/rtl8712/osdep_service.h:31,
from drivers/staging/rtl8712/rtl871x_ioctl_linux.c:20:drivers/staging/rtl8712/rtl871x_ioctl_linux.c: In function 'wpa_set_encryption':
>> drivers/staging/rtl8712/basic_types.h:24:49: error: expected expression before ')' token 24 | #define FIELD_OFFSET(s, field) ((addr_t)&(((s) *)(0))->(field)) | ^ >> drivers/staging/rtl8712/rtl871x_ioctl_linux.c:413:4: note: in expansion of macro 'FIELD_OFFSET' 413 | FIELD_OFFSET(struct NDIS_802_11_WEP, KeyMaterial); | ^~~~~~~~~~~~ drivers/staging/rtl8712/rtl871x_ioctl_linux.c: In function 'r8711_wx_set_enc': >> drivers/staging/rtl8712/basic_types.h:24:49: error: expected expression before ')' token
24 | #define FIELD_OFFSET(s, field) ((addr_t)&(((s) *)(0))->(field))
| ^drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1561:9: note: in expansion of macro 'FIELD_OFFSET'
1561 | FIELD_OFFSET(struct NDIS_802_11_WEP, KeyMaterial);
| ^~~~~~~~~~~~
In file included from drivers/staging/rtl8712/rtl871x_ioctl_linux.c:28:
At top level:drivers/staging/rtl8712/rtl871x_mp_ioctl.h:256:34: warning: 'oid_rtl_seg_81_85' defined but not used [-Wunused-const-variable=] 256 | static const struct oid_obj_priv oid_rtl_seg_81_85[] = {
| ^~~~~~~~~~~~~~~~~drivers/staging/rtl8712/rtl871x_mp_ioctl.h:249:34: warning: 'oid_rtl_seg_81_80_80' defined but not used [-Wunused-const-variable=] 249 | static const struct oid_obj_priv oid_rtl_seg_81_80_80[] = {
| ^~~~~~~~~~~~~~~~~~~~drivers/staging/rtl8712/rtl871x_mp_ioctl.h:240:34: warning: 'oid_rtl_seg_81_80_40' defined but not used [-Wunused-const-variable=] 240 | static const struct oid_obj_priv oid_rtl_seg_81_80_40[] = {
| ^~~~~~~~~~~~~~~~~~~~drivers/staging/rtl8712/rtl871x_mp_ioctl.h:205:34: warning: 'oid_rtl_seg_81_80_20' defined but not used [-Wunused-const-variable=] 205 | static const struct oid_obj_priv oid_rtl_seg_81_80_20[] = {
| ^~~~~~~~~~~~~~~~~~~~drivers/staging/rtl8712/rtl871x_mp_ioctl.h:138:34: warning: 'oid_rtl_seg_81_80_00' defined but not used [-Wunused-const-variable=] 138 | static const struct oid_obj_priv oid_rtl_seg_81_80_00[] = {
| ^~~~~~~~~~~~~~~~~~~~
vim +24 drivers/staging/rtl8712/basic_types.h
21
22 #define SIZE_T __kernel_size_t
23 #define sint signed int
> 24 #define FIELD_OFFSET(s, field) ((addr_t)&(((s) *)(0))->(field))
25 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Greg Kroah-Hartman
maintainerQuoted 5 lines · Ricardo Ferreira
Attempting to wet my feet in kernel patch submission by submitting a checkstyle fix for the rtl8712 driver.
Signed-off-by Ricardo Ferreira <[email protected]>---
What changed from v1?
Always put that below the --- line, so please fix this up and do a v3.
Also, your changelog text is very odd, do you see other commits in the kernel for these files that say things that way? Please try to follow how others do things. Also read the documentation for how to make a good changelog text, that will help out a lot.
thanks,
greg k-h