staging: rtl8192e: Clean up tests on the results of functions that return NULL on failure.

PATCH Superseded pooja.shamili 1 participant 1 message Feb 27, 2016 Staging

Share & tools

pooja.shamili

author

2016-02-27 07:02 UTC #0 lore raw

PATCH v2 1/1 staging: rtl8192e: Clean up tests on the results of functions that return NULL on failure.

Functions returning NULL as a return value on failure can be tested for as !x, NULL == x or x == NULL. As !x is commonly used, all the tests need to be modified to use !x for a consistent coding style. In this patch, the function kzalloc is considered.

Coccinelle is used to achieve this, the semantic patch being:

@@
expression E;
statement S;
@@

E = kzalloc(...);

if (
(
+ !
E
- == NULL
|
+ !
- NULL ==
E
)
) S

Signed-off-by pooja.shamili <[email protected]>

---
 drivers/staging/rtl8192e/rtllib_wx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/staging/rtl8192e/rtllib_wx.c +2 -2

index 84e6272..8060410 100644
@@ -373,7 +373,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
 		/* take WEP into use */
 		new_crypt = kzalloc(sizeof(struct lib80211_crypt_data),
 				    GFP_KERNEL);
-		if (new_crypt == NULL)
+		if (!new_crypt)
 			return -ENOMEM;
 		new_crypt->ops = lib80211_get_crypto_ops("R-WEP");
 		if (!new_crypt->ops) {

@@ -618,7 +618,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
 		lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
 
 		new_crypt = kzalloc(sizeof(*new_crypt), GFP_KERNEL);
-		if (new_crypt == NULL) {
+		if (!new_crypt) {
 			ret = -ENOMEM;
 			goto done;
 		}

Signature · 1 line

2.1.4