--- v2
+++ v1
@@ -6,9 +6,9 @@
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 ---
  drivers/net/netdevsim/bus.c       | 69 ++-----------------------------
- drivers/net/netdevsim/dev.c       | 61 +++++++++++++++++++++++++--
+ drivers/net/netdevsim/dev.c       | 54 +++++++++++++++++++++++-
  drivers/net/netdevsim/netdevsim.h |  6 +--
- 3 files changed, 63 insertions(+), 73 deletions(-)
+ 3 files changed, 58 insertions(+), 71 deletions(-)
 
 diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c
 index 1e7df184419d..d037600c0f0c 100644
@@ -112,7 +112,7 @@
  
  static ssize_t
 diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
-index 8157d28b32e4..c19f36c9e0a1 100644
+index 8157d28b32e4..11af978fdc5f 100644
 --- a/drivers/net/netdevsim/dev.c
 +++ b/drivers/net/netdevsim/dev.c
 @@ -64,6 +64,14 @@ unsigned int nsim_dev_get_vfs(struct nsim_dev *nsim_dev)
@@ -130,28 +130,7 @@
  #define NSIM_DEV_DUMMY_REGION_SIZE (1024 * 32)
  
  static int
-@@ -496,7 +504,9 @@ static void nsim_dev_dummy_region_exit(struct nsim_dev *nsim_dev)
- }
- 
- static void __nsim_dev_port_del(struct nsim_dev_port *nsim_dev_port);
--int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev, struct netlink_ext_ack *extack)
-+
-+static int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev,
-+				  struct netlink_ext_ack *extack)
- {
- 	struct devlink *devlink = priv_to_devlink(nsim_dev);
- 	struct nsim_dev_port *nsim_dev_port, *tmp;
-@@ -511,7 +521,8 @@ int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev, struct netlink_ext_ack *ex
- 	return 0;
- }
- 
--int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev, struct netlink_ext_ack *extack)
-+static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev,
-+				     struct netlink_ext_ack *extack)
- {
- 	struct nsim_bus_dev *nsim_bus_dev = nsim_dev->nsim_bus_dev;
- 	int i, err;
-@@ -1565,8 +1576,11 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)
+@@ -1565,8 +1573,11 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)
  	debugfs_remove(nsim_dev->take_snapshot);
  
  	mutex_lock(&nsim_dev->vfs_lock);
@@ -165,7 +144,7 @@
  	mutex_unlock(&nsim_dev->vfs_lock);
  
  	nsim_dev_port_del_all(nsim_dev);
-@@ -1641,6 +1655,45 @@ int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type
+@@ -1641,6 +1652,45 @@ int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type
  	return err;
  }