netdevsim: remove max_vfs dentry

[linux-2.6-microblaze.git] / drivers / net / netdevsim / dev.c

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 54313bd..6c906de 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -259,11 +259,9 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)
        debugfs_create_bool("fail_trap_policer_counter_get", 0600,
                            nsim_dev->ddir,
                            &nsim_dev->fail_trap_policer_counter_get);
-       nsim_dev->max_vfs = debugfs_create_file("max_vfs",
-                                               0600,
-                                               nsim_dev->ddir,
-                                               nsim_dev->nsim_bus_dev,
-                                               &nsim_dev_max_vfs_fops);
+       debugfs_create_file("max_vfs", 0600, nsim_dev->ddir,
+                           nsim_dev->nsim_bus_dev, &nsim_dev_max_vfs_fops);
+
        nsim_dev->nodes_ddir = debugfs_create_dir("rate_nodes", nsim_dev->ddir);
        if (IS_ERR(nsim_dev->nodes_ddir)) {
                err = PTR_ERR(nsim_dev->nodes_ddir);
@@ -1470,10 +1468,6 @@ int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
        if (err)
                goto err_devlink_free;
 
-       err = devlink_register(devlink);
-       if (err)
-               goto err_resources_unregister;
-
        err = devlink_params_register(devlink, nsim_devlink_params,
                                      ARRAY_SIZE(nsim_devlink_params));
        if (err)
@@ -1514,9 +1508,9 @@ int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
        if (err)
                goto err_psample_exit;
 
-       devlink_params_publish(devlink);
-       devlink_reload_enable(devlink);
        nsim_dev->esw_mode = DEVLINK_ESWITCH_MODE_LEGACY;
+       devlink_set_features(devlink, DEVLINK_F_RELOAD);
+       devlink_register(devlink);
        return 0;
 
 err_psample_exit:
@@ -1537,8 +1531,6 @@ err_params_unregister:
        devlink_params_unregister(devlink, nsim_devlink_params,
                                  ARRAY_SIZE(nsim_devlink_params));
 err_dl_unregister:
-       devlink_unregister(devlink);
-err_resources_unregister:
        devlink_resources_unregister(devlink, NULL);
 err_devlink_free:
        devlink_free(devlink);
@@ -1572,15 +1564,13 @@ 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);
 
-       devlink_reload_disable(devlink);
-
+       devlink_unregister(devlink);
        nsim_dev_reload_destroy(nsim_dev);
 
        nsim_bpf_dev_exit(nsim_dev);
        nsim_dev_debugfs_exit(nsim_dev);
        devlink_params_unregister(devlink, nsim_devlink_params,
                                  ARRAY_SIZE(nsim_devlink_params));
-       devlink_unregister(devlink);
        devlink_resources_unregister(devlink, NULL);
        devlink_free(devlink);
 }