net: dsa: replace devlink resource registration calls by devl_ variants

Replace devlink_resource_register(), devlink_resource_occ_get_register(),
and devlink_resource_occ_get_unregister() calls by respective devl_*
variants. Mentioned functions have no direct users in any drivers, and are
going to be removed in subsequent patches.

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-6-przemyslaw.kitszel@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/devlink.c b/net/dsa/devlink.c
index 0aac887d009804b0d0b1cddc5032a5a68e5ad53e..f41f9fc2194e570bf0a52fc9964d9b63b863be5b 100644 (file)
--- a/net/dsa/devlink.c
+++ b/net/dsa/devlink.c
@@ -229,10 +229,15 @@ int dsa_devlink_resource_register(struct dsa_switch *ds,
                                  u64 parent_resource_id,
                                  const struct devlink_resource_size_params *size_params)
 {
-       return devlink_resource_register(ds->devlink, resource_name,
-                                        resource_size, resource_id,
-                                        parent_resource_id,
-                                        size_params);
+       int ret;
+
+       devl_lock(ds->devlink);
+       ret = devl_resource_register(ds->devlink, resource_name, resource_size,
+                                    resource_id, parent_resource_id,
+                                    size_params);
+       devl_unlock(ds->devlink);
+
+       return ret;
 }
 EXPORT_SYMBOL_GPL(dsa_devlink_resource_register);
 
@@ -247,15 +252,19 @@ void dsa_devlink_resource_occ_get_register(struct dsa_switch *ds,
                                           devlink_resource_occ_get_t *occ_get,
                                           void *occ_get_priv)
 {
-       return devlink_resource_occ_get_register(ds->devlink, resource_id,
-                                                occ_get, occ_get_priv);
+       devl_lock(ds->devlink);
+       devl_resource_occ_get_register(ds->devlink, resource_id, occ_get,
+                                      occ_get_priv);
+       devl_unlock(ds->devlink);
 }
 EXPORT_SYMBOL_GPL(dsa_devlink_resource_occ_get_register);
 
 void dsa_devlink_resource_occ_get_unregister(struct dsa_switch *ds,
                                             u64 resource_id)
 {
-       devlink_resource_occ_get_unregister(ds->devlink, resource_id);
+       devl_lock(ds->devlink);
+       devl_resource_occ_get_unregister(ds->devlink, resource_id);
+       devl_unlock(ds->devlink);
 }
 EXPORT_SYMBOL_GPL(dsa_devlink_resource_occ_get_unregister);