net: devlink: remove netdev arg from devlink_port_type_eth_set()

Since devlink_port_type_eth_set() should no longer be called by any
driver with netdev pointer as it should rather use
SET_NETDEV_DEVLINK_PORT, remove the netdev arg. Add a warn to
type_clear()

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index d3fc86cd3c1d3e97b827cb4dde2210cb5e891ea1..3ae246391549e7e84abf17840e86c20a05659225 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -3043,7 +3043,7 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)
         */
        if (!IS_ENABLED(CONFIG_MLX4_EN) &&
            dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
-               devlink_port_type_eth_set(&info->devlink_port, NULL);
+               devlink_port_type_eth_set(&info->devlink_port);
        else if (!IS_ENABLED(CONFIG_MLX4_INFINIBAND) &&
                 dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)
                devlink_port_type_ib_set(&info->devlink_port, NULL);

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 6c55aabaedf198d8cc77c3c6d916088a1845e177..b1582b32183a81bb79e6ade5978e5af97cc5f419 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1582,8 +1582,7 @@ int devlink_port_register(struct devlink *devlink,
                          unsigned int port_index);
 void devl_port_unregister(struct devlink_port *devlink_port);
 void devlink_port_unregister(struct devlink_port *devlink_port);
-void devlink_port_type_eth_set(struct devlink_port *devlink_port,
-                              struct net_device *netdev);
+void devlink_port_type_eth_set(struct devlink_port *devlink_port);
 void devlink_port_type_ib_set(struct devlink_port *devlink_port,
                              struct ib_device *ibdev);
 void devlink_port_type_clear(struct devlink_port *devlink_port);

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 6f06c05c7b1a4044d76f25b05d649bf53fe1a071..70a374c828ae91c37b7c08283acdb8277a8029b6 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -10097,17 +10097,15 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port,
  *     devlink_port_type_eth_set - Set port type to Ethernet
  *
  *     @devlink_port: devlink port
- *     @netdev: related netdevice
+ *
+ *     If driver is calling this, most likely it is doing something wrong.
  */
-void devlink_port_type_eth_set(struct devlink_port *devlink_port,
-                              struct net_device *netdev)
+void devlink_port_type_eth_set(struct devlink_port *devlink_port)
 {
-       if (!netdev)
-               dev_warn(devlink_port->devlink->dev,
-                        "devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n",
-                        devlink_port->index);
-
-       __devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH, netdev,
+       dev_warn(devlink_port->devlink->dev,
+                "devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n",
+                devlink_port->index);
+       __devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH, NULL,
                                false);
 }
 EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);
@@ -10130,9 +10128,16 @@ EXPORT_SYMBOL_GPL(devlink_port_type_ib_set);
  *     devlink_port_type_clear - Clear port type
  *
  *     @devlink_port: devlink port
+ *
+ *     If driver is calling this for clearing Ethernet type, most likely
+ *     it is doing something wrong.
  */
 void devlink_port_type_clear(struct devlink_port *devlink_port)
 {
+       if (devlink_port->type == DEVLINK_PORT_TYPE_ETH)
+               dev_warn(devlink_port->devlink->dev,
+                        "devlink port type for port %d cleared without a software interface reference, device type not supported by the kernel?\n",
+                        devlink_port->index);
        __devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_NOTSET, NULL,
                                false);
 }