devlink: remove unused devlink_resource_occ_get_register() and _unregister()

Remove not used devlink_resource_occ_get_register() and
devlink_resource_occ_get_unregister() functions; current devlink resource
users are fine with devl_ variants of the two.

Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://patch.msgid.link/20241023131248.27192-7-przemyslaw.kitszel@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index db5eff6cb60fa0c095ae7bac937d823281389499..fdd6a0f9891d52a68694dae93d0a63b6b460bc03 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1797,15 +1797,8 @@ void devl_resource_occ_get_register(struct devlink *devlink,
                                    u64 resource_id,
                                    devlink_resource_occ_get_t *occ_get,
                                    void *occ_get_priv);
-void devlink_resource_occ_get_register(struct devlink *devlink,
-                                      u64 resource_id,
-                                      devlink_resource_occ_get_t *occ_get,
-                                      void *occ_get_priv);
 void devl_resource_occ_get_unregister(struct devlink *devlink,
                                      u64 resource_id);
-
-void devlink_resource_occ_get_unregister(struct devlink *devlink,
-                                        u64 resource_id);
 int devl_params_register(struct devlink *devlink,
                         const struct devlink_param *params,
                         size_t params_count);

diff --git a/net/devlink/resource.c b/net/devlink/resource.c
index 96c0ff24b65abc52e53cbc52004e3012771ff0c1..a923222bbde8f1c7d6da025e63f95478d474d03f 100644 (file)
--- a/net/devlink/resource.c
+++ b/net/devlink/resource.c
@@ -513,28 +513,6 @@ void devl_resource_occ_get_register(struct devlink *devlink,
 }
 EXPORT_SYMBOL_GPL(devl_resource_occ_get_register);
 
-/**
- *     devlink_resource_occ_get_register - register occupancy getter
- *
- *     @devlink: devlink
- *     @resource_id: resource id
- *     @occ_get: occupancy getter callback
- *     @occ_get_priv: occupancy getter callback priv
- *
- *     Context: Takes and release devlink->lock <mutex>.
- */
-void devlink_resource_occ_get_register(struct devlink *devlink,
-                                      u64 resource_id,
-                                      devlink_resource_occ_get_t *occ_get,
-                                      void *occ_get_priv)
-{
-       devl_lock(devlink);
-       devl_resource_occ_get_register(devlink, resource_id,
-                                      occ_get, occ_get_priv);
-       devl_unlock(devlink);
-}
-EXPORT_SYMBOL_GPL(devlink_resource_occ_get_register);
-
 /**
  * devl_resource_occ_get_unregister - unregister occupancy getter
  *
@@ -557,20 +535,3 @@ void devl_resource_occ_get_unregister(struct devlink *devlink,
        resource->occ_get_priv = NULL;
 }
 EXPORT_SYMBOL_GPL(devl_resource_occ_get_unregister);
-
-/**
- *     devlink_resource_occ_get_unregister - unregister occupancy getter
- *
- *     @devlink: devlink
- *     @resource_id: resource id
- *
- *     Context: Takes and release devlink->lock <mutex>.
- */
-void devlink_resource_occ_get_unregister(struct devlink *devlink,
-                                        u64 resource_id)
-{
-       devl_lock(devlink);
-       devl_resource_occ_get_unregister(devlink, resource_id);
-       devl_unlock(devlink);
-}
-EXPORT_SYMBOL_GPL(devlink_resource_occ_get_unregister);