staging: rtl8723bs: Clean up tests if NULL returned on failure
PATCH 1/1 staging: rtl8723bs: Clean up tests if NULL returned on failure
Some functions like kmalloc/kzalloc return NULL on failure. When NULL represents failure, !x is commonly used.
This was done using Coccinelle:
@@
expression *e;
identifier l1;
@@
e = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\)(...);
...
- e == NULL
+ !e
--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +3 -3
@@ -474,7 +474,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); pwep =kzalloc (wep_total_len,GFP_KERNEL ); -if (pwep ==NULL ) { +if (!pwep) {RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_err_, (" wpa_set_encryption: pwep allocate fail !!!\n" )); goto exit; }
@@ -2137,7 +2137,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, param_len =sizeof (struct ieee_param ) + pext->key_len; param =kzalloc (param_len,GFP_KERNEL ); -if (param ==NULL ) +if (!param)return -1 ; param->cmd =IEEE_CMD_SET_ENCRYPTION ;
@@ -3491,7 +3491,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); pwep =kzalloc (wep_total_len,GFP_KERNEL ); -if (pwep ==NULL ) { +if (!pwep) {DBG_871X (" r871x_set_encryption: pwep allocate fail !!!\n" ); goto exit; }
Signature · 1 line
2.17.1
Quoted 2 lines · Simran Singhal
Some functions like kmalloc/kzalloc return NULL on failure. When NULL represents failure, !x is commonly used.
Try for a shorter subject line. "Simplify NULL tests" would do. Then the log message should be in the imperative.
julia
Quoted 56 lines
This was done using Coccinelle:
@@
expression *e;
identifier l1;
@@e = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\)(...);
...
- e == NULL
+ !eSigned-off-by Simran Singhal <[email protected]>--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +3
-4@@ -474,7 +474,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); pwep =kzalloc (wep_total_len,GFP_KERNEL ); -if (pwep ==NULL ) { +if (!pwep) {RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_err_, (" wpa_set_encryption: pwep allocate fail !!!\n" )); goto exit; }@@ -2137,7 +2137,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, param_len =sizeof (struct ieee_param ) + pext->key_len; param =kzalloc (param_len,GFP_KERNEL ); -if (param ==NULL ) +if (!param)return -1 ; param->cmd =IEEE_CMD_SET_ENCRYPTION ;@@ -3491,7 +3491,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); pwep =kzalloc (wep_total_len,GFP_KERNEL ); -if (pwep ==NULL ) { +if (!pwep) {DBG_871X (" r871x_set_encryption: pwep allocate fail !!!\n" ); goto exit; } --2.17.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20200325222908.GA5370%40simran-Inspiron-5558.