devlink: make devlink_param_register/unregister static

There is no user outside the devlink code, so remove the export and make
the functions static. Move them before callers to avoid forward
declarations.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 608a0c198be82485122c57854331f885068b2434..cf74b63918963641bc3246c02300afb9f682017d 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1773,10 +1773,6 @@ int devlink_params_register(struct devlink *devlink,
 void devlink_params_unregister(struct devlink *devlink,
                               const struct devlink_param *params,
                               size_t params_count);
-int devlink_param_register(struct devlink *devlink,
-                          const struct devlink_param *param);
-void devlink_param_unregister(struct devlink *devlink,
-                             const struct devlink_param *param);
 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,

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 74621287f4e5bc2ca0d602c34536fe93f7adefb9..b1216b8f0acca37c57b8dd0104a7bed4f2055746 100644 (file)
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -10793,6 +10793,43 @@ static int devlink_param_verify(const struct devlink_param *param)
                return devlink_param_driver_verify(param);
 }
 
+static int devlink_param_register(struct devlink *devlink,
+                                 const struct devlink_param *param)
+{
+       struct devlink_param_item *param_item;
+
+       WARN_ON(devlink_param_verify(param));
+       WARN_ON(devlink_param_find_by_name(&devlink->param_list, param->name));
+
+       if (param->supported_cmodes == BIT(DEVLINK_PARAM_CMODE_DRIVERINIT))
+               WARN_ON(param->get || param->set);
+       else
+               WARN_ON(!param->get || !param->set);
+
+       param_item = kzalloc(sizeof(*param_item), GFP_KERNEL);
+       if (!param_item)
+               return -ENOMEM;
+
+       param_item->param = param;
+
+       list_add_tail(&param_item->list, &devlink->param_list);
+       devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);
+       return 0;
+}
+
+static void devlink_param_unregister(struct devlink *devlink,
+                                    const struct devlink_param *param)
+{
+       struct devlink_param_item *param_item;
+
+       param_item =
+               devlink_param_find_by_name(&devlink->param_list, param->name);
+       WARN_ON(!param_item);
+       devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_DEL);
+       list_del(&param_item->list);
+       kfree(param_item);
+}
+
 /**
  *     devlink_params_register - register configuration parameters
  *
@@ -10844,59 +10881,6 @@ void devlink_params_unregister(struct devlink *devlink,
 }
 EXPORT_SYMBOL_GPL(devlink_params_unregister);
 
-/**
- * devlink_param_register - register one configuration parameter
- *
- * @devlink: devlink
- * @param: one configuration parameter
- *
- * Register the configuration parameter supported by the driver.
- * Return: returns 0 on successful registration or error code otherwise.
- */
-int devlink_param_register(struct devlink *devlink,
-                          const struct devlink_param *param)
-{
-       struct devlink_param_item *param_item;
-
-       WARN_ON(devlink_param_verify(param));
-       WARN_ON(devlink_param_find_by_name(&devlink->param_list, param->name));
-
-       if (param->supported_cmodes == BIT(DEVLINK_PARAM_CMODE_DRIVERINIT))
-               WARN_ON(param->get || param->set);
-       else
-               WARN_ON(!param->get || !param->set);
-
-       param_item = kzalloc(sizeof(*param_item), GFP_KERNEL);
-       if (!param_item)
-               return -ENOMEM;
-
-       param_item->param = param;
-
-       list_add_tail(&param_item->list, &devlink->param_list);
-       devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(devlink_param_register);
-
-/**
- * devlink_param_unregister - unregister one configuration parameter
- * @devlink: devlink
- * @param: configuration parameter to unregister
- */
-void devlink_param_unregister(struct devlink *devlink,
-                             const struct devlink_param *param)
-{
-       struct devlink_param_item *param_item;
-
-       param_item =
-               devlink_param_find_by_name(&devlink->param_list, param->name);
-       WARN_ON(!param_item);
-       devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_DEL);
-       list_del(&param_item->list);
-       kfree(param_item);
-}
-EXPORT_SYMBOL_GPL(devlink_param_unregister);
-
 /**
  *     devlink_param_driverinit_value_get - get configuration parameter
  *                                          value for driver initializing