funeth: remove pointless check of devlink pointer in create/destroy_netdev() flows
authorJiri Pirko <jiri@nvidia.com>
Fri, 26 Aug 2022 11:04:11 +0000 (13:04 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 31 Aug 2022 05:51:03 +0000 (22:51 -0700)
Once devlink port is successfully registered, the devlink pointer is not
NULL. Therefore, the check is going to be always true and therefore
pointless. Remove it.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Dimitris Michailidis <dmichail@fungible.com>
Link: https://lore.kernel.org/r/20220826110411.1409446-1-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/fungible/funeth/funeth_main.c

index f247b7ad3a8892a0ae780514d641100be5c1b59c..b6de2ad82a32c740defee63b3322eb60e89bfbe1 100644 (file)
@@ -1802,16 +1802,14 @@ static int fun_create_netdev(struct fun_ethdev *ed, unsigned int portid)
        if (rc)
                goto unreg_devlink;
 
-       if (fp->dl_port.devlink)
-               devlink_port_type_eth_set(&fp->dl_port, netdev);
+       devlink_port_type_eth_set(&fp->dl_port, netdev);
 
        return 0;
 
 unreg_devlink:
        ed->netdevs[portid] = NULL;
        fun_ktls_cleanup(fp);
-       if (fp->dl_port.devlink)
-               devlink_port_unregister(&fp->dl_port);
+       devlink_port_unregister(&fp->dl_port);
 free_stats:
        fun_free_stats_area(fp);
 free_rss:
@@ -1830,10 +1828,8 @@ static void fun_destroy_netdev(struct net_device *netdev)
        struct funeth_priv *fp;
 
        fp = netdev_priv(netdev);
-       if (fp->dl_port.devlink) {
-               devlink_port_type_clear(&fp->dl_port);
-               devlink_port_unregister(&fp->dl_port);
-       }
+       devlink_port_type_clear(&fp->dl_port);
+       devlink_port_unregister(&fp->dl_port);
        unregister_netdev(netdev);
        fun_ktls_cleanup(fp);
        fun_free_stats_area(fp);