]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: ks7010: Delete unnecessary checks before the function call "kfree"
authorMarkus Elfring <elfring@users.sourceforge.net>
Sun, 17 Jul 2016 11:14:57 +0000 (13:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Aug 2016 14:34:18 +0000 (16:34 +0200)
The kfree() function tests whether its argument is NULL and then
returns immediately. Thus the test around the calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ks7010/ks7010_sdio.c

index b7337fd813d59de481854d26ef280d8c1a5c44e4..7da6c841e2ccfb2a649603edd3fa4357e301576f 100644 (file)
@@ -732,8 +732,7 @@ static int ks7010_sdio_update_index(struct ks_wlan_private *priv, u32 index)
                goto error_out;
        }
  error_out:
-       if (data_buf)
-               kfree(data_buf);
+       kfree(data_buf);
        return rc;
 }
 
@@ -763,8 +762,7 @@ static int ks7010_sdio_data_compare(struct ks_wlan_private *priv, u32 address,
                goto error_out;
        }
  error_out:
-       if (read_buf)
-               kfree(read_buf);
+       kfree(read_buf);
        return rc;
 }
 
@@ -879,8 +877,7 @@ static int ks7010_upload_firmware(struct ks_wlan_private *priv,
        release_firmware(fw_entry);
  error_out0:
        sdio_release_host(card->func);
-       if (rom_buf)
-               kfree(rom_buf);
+       kfree(rom_buf);
        return rc;
 }
 
@@ -1199,9 +1196,7 @@ static void ks7010_sdio_remove(struct sdio_func *func)
                unregister_netdev(netdev);
 
                trx_device_exit(priv);
-               if (priv->ks_wlan_hw.read_buf) {
-                       kfree(priv->ks_wlan_hw.read_buf);
-               }
+               kfree(priv->ks_wlan_hw.read_buf);
                free_netdev(priv->net_dev);
                card->priv = NULL;
        }