netdevsim: rename 'driver' entry points

kuba-moo · davem330 · commit a66f64b80815 · 2021-11-01T13:29:41.000Z
Rename functions serving as driver entry points
from nsim_dev_... to nsim_drv_... this makes the
API boundary between bus and dev clearer.

Signed-off-by: Jakub Kicinski &lt;kuba@kernel.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c
@@ -80,7 +80,7 @@ new_port_store(struct device *dev, struct device_attribute *attr,
 		return -EBUSY;
 	}
 
-	ret = nsim_dev_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);
+	ret = nsim_drv_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);
 	mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock);
 	return ret ? ret : count;
 }
@@ -110,7 +110,7 @@ del_port_store(struct device *dev, struct device_attribute *attr,
 		return -EBUSY;
 	}
 
-	ret = nsim_dev_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);
+	ret = nsim_drv_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);
 	mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock);
 	return ret ? ret : count;
 }
@@ -250,14 +250,14 @@ static int nsim_bus_probe(struct device *dev)
 {
 	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);
 
-	return nsim_dev_probe(nsim_bus_dev);
+	return nsim_drv_probe(nsim_bus_dev);
 }
 
 static void nsim_bus_remove(struct device *dev)
 {
 	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);
 
-	nsim_dev_remove(nsim_bus_dev);
+	nsim_drv_remove(nsim_bus_dev);
 }
 
 static int nsim_num_vf(struct device *dev)
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
@@ -592,7 +592,7 @@ static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev,
 	int i, err;
 
 	for (i = 0; i < nsim_dev_get_vfs(nsim_dev); i++) {
-		err = nsim_dev_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);
+		err = nsim_drv_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);
 		if (err) {
 			NL_SET_ERR_MSG_MOD(extack, "Failed to initialize VFs' netdevsim ports");
 			pr_err("Failed to initialize VF id=%d. %d.\n", i, err);
@@ -604,7 +604,7 @@ static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev,
 
 err_port_add_vfs:
 	for (i--; i >= 0; i--)
-		nsim_dev_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);
+		nsim_drv_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);
 	return err;
 }
 
@@ -1522,7 +1522,7 @@ static int nsim_dev_reload_create(struct nsim_dev *nsim_dev,
 	return err;
 }
 
-int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
+int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev)
 {
 	struct nsim_dev *nsim_dev;
 	struct devlink *devlink;
@@ -1656,7 +1656,7 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)
 	mutex_destroy(&nsim_dev->port_list_lock);
 }
 
-void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)
+void nsim_drv_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);
@@ -1687,7 +1687,7 @@ __nsim_dev_port_lookup(struct nsim_dev *nsim_dev, enum nsim_dev_port_type type,
 	return NULL;
 }
 
-int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,
+int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,
 		      unsigned int port_index)
 {
 	struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);
@@ -1702,7 +1702,7 @@ int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type
 	return err;
 }
 
-int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,
+int nsim_drv_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,
 		      unsigned int port_index)
 {
 	struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);
diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
@@ -298,12 +298,12 @@ static inline struct net *nsim_dev_net(struct nsim_dev *nsim_dev)
 
 int nsim_dev_init(void);
 void nsim_dev_exit(void);
-int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev);
-void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev);
-int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev,
+int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev);
+void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev);
+int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev,
 		      enum nsim_dev_port_type type,
 		      unsigned int port_index);
-int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev,
+int nsim_drv_port_del(struct nsim_bus_dev *nsim_bus_dev,
 		      enum nsim_dev_port_type type,
 		      unsigned int port_index);
 int nsim_drv_configure_vfs(struct nsim_bus_dev *nsim_bus_dev,

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ new_port_store(struct device dev, struct device_attribute attr,`
`80`	`80`	`return -EBUSY;`
`81`	`81`	`}`
`82`	`82`
`83`		`- ret = nsim_dev_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);`
	`83`	`+ ret = nsim_drv_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);`
`84`	`84`	`mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock);`
`85`	`85`	`return ret ? ret : count;`
`86`	`86`	`}`
`@@ -110,7 +110,7 @@ del_port_store(struct device dev, struct device_attribute attr,`
`110`	`110`	`return -EBUSY;`
`111`	`111`	`}`
`112`	`112`
`113`		`- ret = nsim_dev_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);`
	`113`	`+ ret = nsim_drv_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index);`
`114`	`114`	`mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock);`
`115`	`115`	`return ret ? ret : count;`
`116`	`116`	`}`
`@@ -250,14 +250,14 @@ static int nsim_bus_probe(struct device *dev)`
`250`	`250`	`{`
`251`	`251`	`struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);`
`252`	`252`
`253`		`- return nsim_dev_probe(nsim_bus_dev);`
	`253`	`+ return nsim_drv_probe(nsim_bus_dev);`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`static void nsim_bus_remove(struct device *dev)`
`257`	`257`	`{`
`258`	`258`	`struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);`
`259`	`259`
`260`		`- nsim_dev_remove(nsim_bus_dev);`
	`260`	`+ nsim_drv_remove(nsim_bus_dev);`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`static int nsim_num_vf(struct device *dev)`
Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev,`
`592`	`592`	`int i, err;`
`593`	`593`
`594`	`594`	`for (i = 0; i < nsim_dev_get_vfs(nsim_dev); i++) {`
`595`		`- err = nsim_dev_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);`
	`595`	`+ err = nsim_drv_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);`
`596`	`596`	`if (err) {`
`597`	`597`	`NL_SET_ERR_MSG_MOD(extack, "Failed to initialize VFs' netdevsim ports");`
`598`	`598`	`pr_err("Failed to initialize VF id=%d. %d.\n", i, err);`
`@@ -604,7 +604,7 @@ static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev,`
`604`	`604`
`605`	`605`	`err_port_add_vfs:`
`606`	`606`	`for (i--; i >= 0; i--)`
`607`		`- nsim_dev_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);`
	`607`	`+ nsim_drv_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_VF, i);`
`608`	`608`	`return err;`
`609`	`609`	`}`
`610`	`610`
`@@ -1522,7 +1522,7 @@ static int nsim_dev_reload_create(struct nsim_dev *nsim_dev,`
`1522`	`1522`	`return err;`
`1523`	`1523`	`}`
`1524`	`1524`
`1525`		`-int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)`
	`1525`	`+int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev)`
`1526`	`1526`	`{`
`1527`	`1527`	`struct nsim_dev *nsim_dev;`
`1528`	`1528`	`struct devlink *devlink;`
`@@ -1656,7 +1656,7 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)`
`1656`	`1656`	`mutex_destroy(&nsim_dev->port_list_lock);`
`1657`	`1657`	`}`
`1658`	`1658`
`1659`		`-void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)`
	`1659`	`+void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev)`
`1660`	`1660`	`{`
`1661`	`1661`	`struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);`
`1662`	`1662`	`struct devlink *devlink = priv_to_devlink(nsim_dev);`
`@@ -1687,7 +1687,7 @@ __nsim_dev_port_lookup(struct nsim_dev *nsim_dev, enum nsim_dev_port_type type,`
`1687`	`1687`	`return NULL;`
`1688`	`1688`	`}`
`1689`	`1689`
`1690`		`-int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,`
	`1690`	`+int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,`
`1691`	`1691`	`unsigned int port_index)`
`1692`	`1692`	`{`
`1693`	`1693`	`struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);`
`@@ -1702,7 +1702,7 @@ int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type`
`1702`	`1702`	`return err;`
`1703`	`1703`	`}`
`1704`	`1704`
`1705`		`-int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,`
	`1705`	`+int nsim_drv_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type,`
`1706`	`1706`	`unsigned int port_index)`
`1707`	`1707`	`{`
`1708`	`1708`	`struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);`