devlink: move port_type_set() op into devlink_port_ops

Move port_type_set() from devlink_ops into newly introduced
devlink_port_ops.

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 369642478fab8f796544c93ce5d821b31cc19b2e..61286b0d9b0cb619896de03874acca0fbd3a5315 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -3024,7 +3024,33 @@ no_msi:
        }
 }
 
+static int mlx4_devlink_port_type_set(struct devlink_port *devlink_port,
+                                     enum devlink_port_type port_type)
+{
+       struct mlx4_port_info *info = container_of(devlink_port,
+                                                  struct mlx4_port_info,
+                                                  devlink_port);
+       enum mlx4_port_type mlx4_port_type;
+
+       switch (port_type) {
+       case DEVLINK_PORT_TYPE_AUTO:
+               mlx4_port_type = MLX4_PORT_TYPE_AUTO;
+               break;
+       case DEVLINK_PORT_TYPE_ETH:
+               mlx4_port_type = MLX4_PORT_TYPE_ETH;
+               break;
+       case DEVLINK_PORT_TYPE_IB:
+               mlx4_port_type = MLX4_PORT_TYPE_IB;
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       return __set_port_type(info, mlx4_port_type);
+}
+
 static const struct devlink_port_ops mlx4_devlink_port_ops = {
+       .port_type_set = mlx4_devlink_port_type_set,
 };
 
 static int mlx4_init_port_info(struct mlx4_dev *dev, int port)
@@ -3878,31 +3904,6 @@ err_disable_pdev:
        return err;
 }
 
-static int mlx4_devlink_port_type_set(struct devlink_port *devlink_port,
-                                     enum devlink_port_type port_type)
-{
-       struct mlx4_port_info *info = container_of(devlink_port,
-                                                  struct mlx4_port_info,
-                                                  devlink_port);
-       enum mlx4_port_type mlx4_port_type;
-
-       switch (port_type) {
-       case DEVLINK_PORT_TYPE_AUTO:
-               mlx4_port_type = MLX4_PORT_TYPE_AUTO;
-               break;
-       case DEVLINK_PORT_TYPE_ETH:
-               mlx4_port_type = MLX4_PORT_TYPE_ETH;
-               break;
-       case DEVLINK_PORT_TYPE_IB:
-               mlx4_port_type = MLX4_PORT_TYPE_IB;
-               break;
-       default:
-               return -EOPNOTSUPP;
-       }
-
-       return __set_port_type(info, mlx4_port_type);
-}
-
 static void mlx4_devlink_param_load_driverinit_values(struct devlink *devlink)
 {
        struct mlx4_priv *priv = devlink_priv(devlink);
@@ -3987,7 +3988,6 @@ static int mlx4_devlink_reload_up(struct devlink *devlink, enum devlink_reload_a
 }
 
 static const struct devlink_ops mlx4_devlink_ops = {
-       .port_type_set  = mlx4_devlink_port_type_set,
        .reload_actions = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT),
        .reload_down    = mlx4_devlink_reload_down,
        .reload_up      = mlx4_devlink_reload_up,

diff --git a/include/net/devlink.h b/include/net/devlink.h
index fdcb2c55f1b5dc6b158a36ff92cf31a85456c3a4..0dfadc234b9e5717b922d188f09b4494660de862 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1274,8 +1274,6 @@ struct devlink_ops {
        int (*reload_up)(struct devlink *devlink, enum devlink_reload_action action,
                         enum devlink_reload_limit limit, u32 *actions_performed,
                         struct netlink_ext_ack *extack);
-       int (*port_type_set)(struct devlink_port *devlink_port,
-                            enum devlink_port_type port_type);
        int (*sb_pool_get)(struct devlink *devlink, unsigned int sb_index,
                           u16 pool_index,
                           struct devlink_sb_pool_info *pool_info);
@@ -1652,12 +1650,15 @@ void devlink_free(struct devlink *devlink);
  * @port_split: Callback used to split the port into multiple ones.
  * @port_unsplit: Callback used to unsplit the port group back into
  *               a single port.
+ * @port_type_set: Callback used to set a type of a port.
  */
 struct devlink_port_ops {
        int (*port_split)(struct devlink *devlink, struct devlink_port *port,
                          unsigned int count, struct netlink_ext_ack *extack);
        int (*port_unsplit)(struct devlink *devlink, struct devlink_port *port,
                            struct netlink_ext_ack *extack);
+       int (*port_type_set)(struct devlink_port *devlink_port,
+                            enum devlink_port_type port_type);
 };
 
 void devlink_port_init(struct devlink *devlink,

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 1ed95c76cf674ca529b92e93960a3be37ba228a9..d69e278ae15a2fdf44e20942df60820a979eeb47 100644 (file)
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -1137,14 +1137,13 @@ static int devlink_port_type_set(struct devlink_port *devlink_port,
 {
        int err;
 
-       if (!devlink_port->devlink->ops->port_type_set)
+       if (!devlink_port->ops->port_type_set)
                return -EOPNOTSUPP;
 
        if (port_type == devlink_port->type)
                return 0;
 
-       err = devlink_port->devlink->ops->port_type_set(devlink_port,
-                                                       port_type);
+       err = devlink_port->ops->port_type_set(devlink_port, port_type);
        if (err)
                return err;