ethernet/ti: delete if NULL check befort devm_kfree
authorBernard Zhao <bernard@vivo.com>
Mon, 16 May 2022 01:52:05 +0000 (18:52 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 17 May 2022 09:19:15 +0000 (11:19 +0200)
devm_kfree check the pointer, there is no need to check before
devm_kfree call.
This change is to cleanup the code a bit.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
Link: https://lore.kernel.org/r/20220516015208.6526-1-bernard@vivo.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/ti/am65-cpsw-qos.c

index aa32dd9..e162771 100644 (file)
@@ -166,8 +166,7 @@ static void am65_cpsw_admin_to_oper(struct net_device *ndev)
 {
        struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
 
-       if (port->qos.est_oper)
-               devm_kfree(&ndev->dev, port->qos.est_oper);
+       devm_kfree(&ndev->dev, port->qos.est_oper);
 
        port->qos.est_oper = port->qos.est_admin;
        port->qos.est_admin = NULL;
@@ -434,11 +433,8 @@ static void am65_cpsw_purge_est(struct net_device *ndev)
 
        am65_cpsw_stop_est(ndev);
 
-       if (port->qos.est_admin)
-               devm_kfree(&ndev->dev, port->qos.est_admin);
-
-       if (port->qos.est_oper)
-               devm_kfree(&ndev->dev, port->qos.est_oper);
+       devm_kfree(&ndev->dev, port->qos.est_admin);
+       devm_kfree(&ndev->dev, port->qos.est_oper);
 
        port->qos.est_oper = NULL;
        port->qos.est_admin = NULL;
@@ -524,8 +520,7 @@ static int am65_cpsw_set_taprio(struct net_device *ndev, void *type_data)
        ret = am65_cpsw_configure_taprio(ndev, est_new);
        if (!ret) {
                if (taprio->enable) {
-                       if (port->qos.est_admin)
-                               devm_kfree(&ndev->dev, port->qos.est_admin);
+                       devm_kfree(&ndev->dev, port->qos.est_admin);
 
                        port->qos.est_admin = est_new;
                } else {