Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netdevsim: rename 'driver' entry points

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 <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jakub Kicinski and committed by
David S. Miller
a66f64b8 a3353ec3

+14 -14
+4 -4
drivers/net/netdevsim/bus.c
··· 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 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 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)
+6 -6
drivers/net/netdevsim/dev.c
··· 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 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 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 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 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 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);
+4 -4
drivers/net/netdevsim/netdevsim.h
··· 298 298 299 299 int nsim_dev_init(void); 300 300 void nsim_dev_exit(void); 301 - int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev); 302 - void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev); 303 - int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev, 301 + int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev); 302 + void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev); 303 + int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, 304 304 enum nsim_dev_port_type type, 305 305 unsigned int port_index); 306 - int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev, 306 + int nsim_drv_port_del(struct nsim_bus_dev *nsim_bus_dev, 307 307 enum nsim_dev_port_type type, 308 308 unsigned int port_index); 309 309 int nsim_drv_configure_vfs(struct nsim_bus_dev *nsim_bus_dev,