OSDN Git Service

staging: rtl8192u: Clean up tests if NULL returned on failure
authorsimran singhal <singhalsimran0@gmail.com>
Sat, 4 Mar 2017 16:46:53 +0000 (22:16 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Mar 2017 17:19:07 +0000 (18:19 +0100)
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

Signed-off-by: simran singhal <singhalsimran0@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c

index 2453413..5039172 100644 (file)
@@ -67,7 +67,7 @@ static void *ieee80211_tkip_init(int key_idx)
        struct ieee80211_tkip_data *priv;
 
        priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
-       if (priv == NULL)
+       if (!priv)
                goto fail;
        priv->key_idx = key_idx;
 
index 0e8c876..7ba4b07 100644 (file)
@@ -42,7 +42,7 @@ static void *prism2_wep_init(int keyidx)
        struct prism2_wep_data *priv;
 
        priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
-       if (priv == NULL)
+       if (!priv)
                return NULL;
        priv->key_idx = keyidx;
 
index ccb1221..14aea26 100644 (file)
@@ -3025,7 +3025,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
                ieee80211_crypt_delayed_deinit(ieee, crypt);
 
                new_crypt = kzalloc(sizeof(*new_crypt), GFP_KERNEL);
-               if (new_crypt == NULL) {
+               if (!new_crypt) {
                        ret = -ENOMEM;
                        goto done;
                }
index 2481c21..c925e53 100644 (file)
@@ -362,7 +362,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
                /* take WEP into use */
                new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
                                    GFP_KERNEL);
-               if (new_crypt == NULL)
+               if (!new_crypt)
                        return -ENOMEM;
                new_crypt->ops = ieee80211_get_crypto_ops("WEP");
                if (!new_crypt->ops) {
@@ -610,7 +610,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
                ieee80211_crypt_delayed_deinit(ieee, crypt);
 
                new_crypt = kzalloc(sizeof(*new_crypt), GFP_KERNEL);
-               if (new_crypt == NULL) {
+               if (!new_crypt) {
                        ret = -ENOMEM;
                        goto done;
                }