summaryrefslogtreecommitdiff
path: root/drivers/net/netdevsim/netdev.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2019-04-25 15:59:44 +0200
committerDavid S. Miller <davem@davemloft.net>2019-04-26 01:52:02 -0400
commit925f5afedb93f7c80958c6bf7ce6cc31542076dc (patch)
treeea5aa25c130f56d87bcccba92f8bfe0d43fe58b3 /drivers/net/netdevsim/netdev.c
parent8fb4bc6fd5bd5bab9a34581e45b00d9a041d1d71 (diff)
netdevsim: put netdevsim bus code into separate file
As the code related to netdevsim bus is going to get bigger, move the existing code to a separate file. Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netdevsim/netdev.c')
-rw-r--r--drivers/net/netdevsim/netdev.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index 31fc6564d181..7bc0da8cc10d 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -42,19 +42,13 @@ struct nsim_vf_config {
static struct dentry *nsim_ddir;
-static int nsim_num_vf(struct device *dev)
+int nsim_num_vf(struct device *dev)
{
struct netdevsim *ns = to_nsim(dev);
return ns->num_vfs;
}
-static struct bus_type nsim_bus = {
- .name = DRV_NAME,
- .dev_name = DRV_NAME,
- .num_vf = nsim_num_vf,
-};
-
static int nsim_vfs_enable(struct netdevsim *ns, unsigned int num_vfs)
{
ns->vfconfigs = kcalloc(num_vfs, sizeof(struct nsim_vf_config),
@@ -544,18 +538,18 @@ static int __init nsim_module_init(void)
if (err)
goto err_debugfs_destroy;
- err = bus_register(&nsim_bus);
+ err = nsim_bus_init();
if (err)
goto err_sdev_exit;
err = rtnl_link_register(&nsim_link_ops);
if (err)
- goto err_unreg_bus;
+ goto err_bus_exit;
return 0;
-err_unreg_bus:
- bus_unregister(&nsim_bus);
+err_bus_exit:
+ nsim_bus_exit();
err_sdev_exit:
nsim_sdev_exit();
err_debugfs_destroy:
@@ -566,7 +560,7 @@ err_debugfs_destroy:
static void __exit nsim_module_exit(void)
{
rtnl_link_unregister(&nsim_link_ops);
- bus_unregister(&nsim_bus);
+ nsim_bus_exit();
nsim_sdev_exit();
debugfs_remove_recursive(nsim_ddir);
}