um: NULL check before kfree is not needed

kfree(NULL) is safe,so this removes NULL check before freeing the mem

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 50ee3bb5a63a9eb950d76baeba475bcf7f0700b8..c84133cf4848e837e5fe55b6ee9af78dc319c8a4 100644 (file)
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -1118,16 +1118,11 @@ static int vector_net_close(struct net_device *dev)
                os_close_file(vp->fds->tx_fd);
                vp->fds->tx_fd = -1;
        }
-       if (vp->bpf != NULL)
-               kfree(vp->bpf);
-       if (vp->fds->remote_addr != NULL)
-               kfree(vp->fds->remote_addr);
-       if (vp->transport_data != NULL)
-               kfree(vp->transport_data);
-       if (vp->header_rxbuffer != NULL)
-               kfree(vp->header_rxbuffer);
-       if (vp->header_txbuffer != NULL)
-               kfree(vp->header_txbuffer);
+       kfree(vp->bpf);
+       kfree(vp->fds->remote_addr);
+       kfree(vp->transport_data);
+       kfree(vp->header_rxbuffer);
+       kfree(vp->header_txbuffer);
        if (vp->rx_queue != NULL)
                destroy_queue(vp->rx_queue);
        if (vp->tx_queue != NULL)

diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c
index 4d6a78e31089f6c12f94bddbf9a53f85bf8d0401..3d8cdbdb4e661988df125b9cdb68d906fb1312a6 100644 (file)
--- a/arch/um/drivers/vector_user.c
+++ b/arch/um/drivers/vector_user.c
@@ -267,8 +267,7 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec)
                os_close_file(rxfd);
        if (txfd >= 0)
                os_close_file(txfd);
-       if (result != NULL)
-               kfree(result);
+       kfree(result);
        return NULL;
 }
 
@@ -434,8 +433,7 @@ static struct vector_fds *user_init_socket_fds(struct arglist *ifspec, int id)
        if (fd >= 0)
                os_close_file(fd);
        if (result != NULL) {
-               if (result->remote_addr != NULL)
-                       kfree(result->remote_addr);
+               kfree(result->remote_addr);
                kfree(result);
        }
        return NULL;

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 6b7f3827d6e4add1993315c220bf96217bfb8986..8360fa3f676df2ec0e051235bb5aebea68cc9f83 100644 (file)
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -244,8 +244,7 @@ static void garbage_collect_irq_entries(void)
                        to_free = NULL;
                }
                walk = walk->next;
-               if (to_free != NULL)
-                       kfree(to_free);
+               kfree(to_free);
        }
 }