netdevsim: drop code duplicated by a merge

Looks like the port adding loop makes a re-appearance on net-next
after net was merged back into it (even though it doesn't feature
in the merge diff).

The ports are already added in nsim_dev_create() so when we try
to add them again get EEXIST, and see:

netdevsim: probe of netdevsim0 failed with error -17

in the logs. When we remove the loop again the nsim_dev_probe()
and nsim_dev_remove() become a wrapper of nsim_dev_create() and
nsim_dev_destroy(). Remove this layer of indirection.

Fixes: d31e95585ca6 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index e59a882..3da96c7 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -753,7 +753,7 @@ err_fib_destroy:
        return err;
 }
 
-static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)
+int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
 {
        struct nsim_dev *nsim_dev;
        struct devlink *devlink;
@@ -761,7 +761,7 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)
 
        devlink = devlink_alloc(&nsim_dev_devlink_ops, sizeof(*nsim_dev));
        if (!devlink)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
        devlink_net_set(devlink, nsim_bus_dev->initial_net);
        nsim_dev = devlink_priv(devlink);
        nsim_dev->nsim_bus_dev = nsim_bus_dev;
@@ -773,6 +773,8 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)
        nsim_dev->max_macs = NSIM_DEV_MAX_MACS_DEFAULT;
        nsim_dev->test1 = NSIM_DEV_TEST1_DEFAULT;
 
+       dev_set_drvdata(&nsim_bus_dev->dev, nsim_dev);
+
        err = nsim_dev_resources_register(devlink);
        if (err)
                goto err_devlink_free;
@@ -818,7 +820,7 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)
                goto err_bpf_dev_exit;
 
        devlink_params_publish(devlink);
-       return nsim_dev;
+       return 0;
 
 err_bpf_dev_exit:
        nsim_bpf_dev_exit(nsim_dev);
@@ -841,7 +843,7 @@ err_resources_unregister:
        devlink_resources_unregister(devlink, NULL);
 err_devlink_free:
        devlink_free(devlink);
-       return ERR_PTR(err);
+       return err;
 }
 
 static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)
@@ -858,8 +860,9 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)
        nsim_fib_destroy(devlink, nsim_dev->fib_data);
 }
 
-static void nsim_dev_destroy(struct nsim_dev *nsim_dev)
+void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)
 {
+       struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);
        struct devlink *devlink = priv_to_devlink(nsim_dev);
 
        nsim_dev_reload_destroy(nsim_dev);
@@ -873,40 +876,6 @@ static void nsim_dev_destroy(struct nsim_dev *nsim_dev)
        devlink_free(devlink);
 }
 
-int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
-{
-       struct nsim_dev *nsim_dev;
-       int i;
-       int err;
-
-       nsim_dev = nsim_dev_create(nsim_bus_dev);
-       if (IS_ERR(nsim_dev))
-               return PTR_ERR(nsim_dev);
-       dev_set_drvdata(&nsim_bus_dev->dev, nsim_dev);
-
-       mutex_lock(&nsim_dev->port_list_lock);
-       for (i = 0; i < nsim_bus_dev->port_count; i++) {
-               err = __nsim_dev_port_add(nsim_dev, i);
-               if (err)
-                       goto err_port_del_all;
-       }
-       mutex_unlock(&nsim_dev->port_list_lock);
-       return 0;
-
-err_port_del_all:
-       mutex_unlock(&nsim_dev->port_list_lock);
-       nsim_dev_port_del_all(nsim_dev);
-       nsim_dev_destroy(nsim_dev);
-       return err;
-}
-
-void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)
-{
-       struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);
-
-       nsim_dev_destroy(nsim_dev);
-}
-
 static struct nsim_dev_port *
 __nsim_dev_port_lookup(struct nsim_dev *nsim_dev, unsigned int port_index)
 {