staging: r8188eu: remove null pointer checks before kfree
authorMichael Straube <straube.linux@gmail.com>
Wed, 18 Aug 2021 08:58:09 +0000 (10:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Aug 2021 10:45:45 +0000 (12:45 +0200)
kfree(NULL) is safe, so remove unnecessary null pointer checks before
calls to kfree. Reported by checkpatch.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210818085809.31451-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_ap.c
drivers/staging/r8188eu/core/rtw_cmd.c

index 8ef0586b753f5c51c7ba621fef8a85e3fbbb9bb7..1127e9a524584ba35687189d6a4a5e49b643b322 100644 (file)
@@ -1314,8 +1314,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
                pnetwork->IELength = wps_offset + (wps_ielen + 2) + remainder_ielen;
        }
 
-       if (pbackup_remainder_ie)
-               kfree(pbackup_remainder_ie);
+       kfree(pbackup_remainder_ie);
 }
 
 static void update_bcn_p2p_ie(struct adapter *padapter)
index 7c640c8148f6c6593ffba1cd21a4ff188b97ac78..21a048d52b5a7ab141793716ba1f04438d5905a7 100644 (file)
@@ -89,13 +89,9 @@ void rtw_free_evt_priv(struct        evt_priv *pevtpriv)
 
 void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
 {
-
        if (pcmdpriv) {
-               if (pcmdpriv->cmd_allocated_buf)
-                       kfree(pcmdpriv->cmd_allocated_buf);
-
-               if (pcmdpriv->rsp_allocated_buf)
-                       kfree(pcmdpriv->rsp_allocated_buf);
+               kfree(pcmdpriv->cmd_allocated_buf);
+               kfree(pcmdpriv->rsp_allocated_buf);
        }
 }
 
@@ -818,11 +814,8 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
 
        psecnetwork = (struct wlan_bssid_ex *)&psecuritypriv->sec_bss;
        if (!psecnetwork) {
-               if (pcmd)
-                       kfree(pcmd);
-
+               kfree(pcmd);
                res = _FAIL;
-
                goto exit;
        }