devlink: Delete not-used devlink APIs

Devlink core exported generously the functions calls that were used
by netdevsim tests or not used at all.

Delete such APIs with one exception - devlink_alloc_ns(). That function
should be spared from deleting because it is a special form of devlink_alloc()
needed for the netdevsim.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/netdevsim/health.c b/drivers/net/netdevsim/health.c
index 04aebdf857474457654d1c25699d156591f75985..aa77af4a68df6fc60a3ce9c081fc98c60df65158 100644 (file)
--- a/drivers/net/netdevsim/health.c
+++ b/drivers/net/netdevsim/health.c
@@ -110,26 +110,6 @@ static int nsim_dev_dummy_fmsg_put(struct devlink_fmsg *fmsg, u32 binary_len)
        if (err)
                return err;
 
-       err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_bool_array");
-       if (err)
-               return err;
-       for (i = 0; i < 10; i++) {
-               err = devlink_fmsg_bool_put(fmsg, true);
-               if (err)
-                       return err;
-       }
-       err = devlink_fmsg_arr_pair_nest_end(fmsg);
-       if (err)
-               return err;
-
-       err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_u8_array");
-       if (err)
-               return err;
-       for (i = 0; i < 10; i++) {
-               err = devlink_fmsg_u8_put(fmsg, i);
-               if (err)
-                       return err;
-       }
        err = devlink_fmsg_arr_pair_nest_end(fmsg);
        if (err)
                return err;
@@ -146,18 +126,6 @@ static int nsim_dev_dummy_fmsg_put(struct devlink_fmsg *fmsg, u32 binary_len)
        if (err)
                return err;
 
-       err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_u64_array");
-       if (err)
-               return err;
-       for (i = 0; i < 10; i++) {
-               err = devlink_fmsg_u64_put(fmsg, i);
-               if (err)
-                       return err;
-       }
-       err = devlink_fmsg_arr_pair_nest_end(fmsg);
-       if (err)
-               return err;
-
        err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_array_of_objects");
        if (err)
                return err;

diff --git a/include/net/devlink.h b/include/net/devlink.h
index cd89b2dc2354e451fe089aea511ad4a07e1a9de2..0e06b3dbbec64e13211503ea1aea04219a75a613 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1663,18 +1663,7 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,
                                       union devlink_param_value *init_val);
 int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,
                                       union devlink_param_value init_val);
-int
-devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port,
-                                       u32 param_id,
-                                       union devlink_param_value *init_val);
-int devlink_port_param_driverinit_value_set(struct devlink_port *devlink_port,
-                                           u32 param_id,
-                                           union devlink_param_value init_val);
 void devlink_param_value_changed(struct devlink *devlink, u32 param_id);
-void devlink_port_param_value_changed(struct devlink_port *devlink_port,
-                                     u32 param_id);
-void devlink_param_value_str_fill(union devlink_param_value *dst_val,
-                                 const char *src);
 struct devlink_region *
 devlink_region_create(struct devlink *devlink,
                      const struct devlink_region_ops *ops,
@@ -1719,10 +1708,7 @@ int devlink_fmsg_binary_pair_nest_start(struct devlink_fmsg *fmsg,
                                        const char *name);
 int devlink_fmsg_binary_pair_nest_end(struct devlink_fmsg *fmsg);
 
-int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value);
-int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value);
 int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value);
-int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value);
 int devlink_fmsg_string_put(struct devlink_fmsg *fmsg, const char *value);
 int devlink_fmsg_binary_put(struct devlink_fmsg *fmsg, const void *value,
                            u16 value_len);

diff --git a/net/core/devlink.c b/net/core/devlink.c
index f30121f074674a5de8e59597c0abc6baabc5944b..0f1663453ca00ecc6ddce41a0e41b2cfa9711013 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -6269,23 +6269,21 @@ static int devlink_fmsg_put_value(struct devlink_fmsg *fmsg,
        return 0;
 }
 
-int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value)
+static int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value)
 {
        if (fmsg->putting_binary)
                return -EINVAL;
 
        return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_FLAG);
 }
-EXPORT_SYMBOL_GPL(devlink_fmsg_bool_put);
 
-int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value)
+static int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value)
 {
        if (fmsg->putting_binary)
                return -EINVAL;
 
        return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_U8);
 }
-EXPORT_SYMBOL_GPL(devlink_fmsg_u8_put);
 
 int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value)
 {
@@ -6296,14 +6294,13 @@ int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value)
 }
 EXPORT_SYMBOL_GPL(devlink_fmsg_u32_put);
 
-int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value)
+static int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value)
 {
        if (fmsg->putting_binary)
                return -EINVAL;
 
        return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_U64);
 }
-EXPORT_SYMBOL_GPL(devlink_fmsg_u64_put);
 
 int devlink_fmsg_string_put(struct devlink_fmsg *fmsg, const char *value)
 {
@@ -10257,55 +10254,6 @@ int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,
 }
 EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_set);
 
-/**
- *     devlink_port_param_driverinit_value_get - get configuration parameter
- *                                             value for driver initializing
- *
- *     @devlink_port: devlink_port
- *     @param_id: parameter ID
- *     @init_val: value of parameter in driverinit configuration mode
- *
- *     This function should be used by the driver to get driverinit
- *     configuration for initialization after reload command.
- */
-int devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port,
-                                           u32 param_id,
-                                           union devlink_param_value *init_val)
-{
-       struct devlink *devlink = devlink_port->devlink;
-
-       if (!devlink_reload_supported(devlink->ops))
-               return -EOPNOTSUPP;
-
-       return __devlink_param_driverinit_value_get(&devlink_port->param_list,
-                                                   param_id, init_val);
-}
-EXPORT_SYMBOL_GPL(devlink_port_param_driverinit_value_get);
-
-/**
- *     devlink_port_param_driverinit_value_set - set value of configuration
- *                                               parameter for driverinit
- *                                               configuration mode
- *
- *     @devlink_port: devlink_port
- *     @param_id: parameter ID
- *     @init_val: value of parameter to set for driverinit configuration mode
- *
- *     This function should be used by the driver to set driverinit
- *     configuration mode default value.
- */
-int devlink_port_param_driverinit_value_set(struct devlink_port *devlink_port,
-                                           u32 param_id,
-                                           union devlink_param_value init_val)
-{
-       return __devlink_param_driverinit_value_set(devlink_port->devlink,
-                                                   devlink_port->index,
-                                                   &devlink_port->param_list,
-                                                   param_id, init_val,
-                                                   DEVLINK_CMD_PORT_PARAM_NEW);
-}
-EXPORT_SYMBOL_GPL(devlink_port_param_driverinit_value_set);
-
 /**
  *     devlink_param_value_changed - notify devlink on a parameter's value
  *                                   change. Should be called by the driver
@@ -10329,50 +10277,6 @@ void devlink_param_value_changed(struct devlink *devlink, u32 param_id)
 }
 EXPORT_SYMBOL_GPL(devlink_param_value_changed);
 
-/**
- *     devlink_port_param_value_changed - notify devlink on a parameter's value
- *                                      change. Should be called by the driver
- *                                      right after the change.
- *
- *     @devlink_port: devlink_port
- *     @param_id: parameter ID
- *
- *     This function should be used by the driver to notify devlink on value
- *     change, excluding driverinit configuration mode.
- *     For driverinit configuration mode driver should use the function
- *     devlink_port_param_driverinit_value_set() instead.
- */
-void devlink_port_param_value_changed(struct devlink_port *devlink_port,
-                                     u32 param_id)
-{
-       struct devlink_param_item *param_item;
-
-       param_item = devlink_param_find_by_id(&devlink_port->param_list,
-                                             param_id);
-       WARN_ON(!param_item);
-
-       devlink_param_notify(devlink_port->devlink, devlink_port->index,
-                            param_item, DEVLINK_CMD_PORT_PARAM_NEW);
-}
-EXPORT_SYMBOL_GPL(devlink_port_param_value_changed);
-
-/**
- *     devlink_param_value_str_fill - Safely fill-up the string preventing
- *                                    from overflow of the preallocated buffer
- *
- *     @dst_val: destination devlink_param_value
- *     @src: source buffer
- */
-void devlink_param_value_str_fill(union devlink_param_value *dst_val,
-                                 const char *src)
-{
-       size_t len;
-
-       len = strlcpy(dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE);
-       WARN_ON(len >= __DEVLINK_PARAM_MAX_STRING_VALUE);
-}
-EXPORT_SYMBOL_GPL(devlink_param_value_str_fill);
-
 /**
  *     devlink_region_create - create a new address region
  *