From: Jiri Pirko <jiri@nvidia.com>
Date: Wed, 13 Jul 2022 16:18:51 +0200
Subject: net: devlink: make devlink_dpipe_headers_register() return void
Patch-mainline: v6.0-rc1
Git-commit: 9a7923668bc779dd601d94704b4dd895a2ef6a77
References: jsc#PED-1549
The return value is not used, so change the return value type to void.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 6 ++----
include/net/devlink.h | 2 +-
net/core/devlink.c | 5 ++---
3 files changed, 5 insertions(+), 8 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
@@ -1266,10 +1266,8 @@ int mlxsw_sp_dpipe_init(struct mlxsw_sp
struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);
int err;
- err = devlink_dpipe_headers_register(devlink,
- &mlxsw_sp_dpipe_headers);
- if (err)
- return err;
+ devlink_dpipe_headers_register(devlink, &mlxsw_sp_dpipe_headers);
+
err = mlxsw_sp_dpipe_erif_table_init(mlxsw_sp);
if (err)
goto err_erif_table_init;
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1595,7 +1595,7 @@ int devlink_dpipe_table_register(struct
void *priv, bool counter_control_extern);
void devlink_dpipe_table_unregister(struct devlink *devlink,
const char *table_name);
-int devlink_dpipe_headers_register(struct devlink *devlink,
+void devlink_dpipe_headers_register(struct devlink *devlink,
struct devlink_dpipe_headers *dpipe_headers);
void devlink_dpipe_headers_unregister(struct devlink *devlink);
bool devlink_dpipe_table_counter_enabled(struct devlink *devlink,
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -10527,13 +10527,12 @@ EXPORT_SYMBOL_GPL(devlink_sb_unregister)
*
* Register the headers supported by hardware.
*/
-int devlink_dpipe_headers_register(struct devlink *devlink,
- struct devlink_dpipe_headers *dpipe_headers)
+void devlink_dpipe_headers_register(struct devlink *devlink,
+ struct devlink_dpipe_headers *dpipe_headers)
{
devl_lock(devlink);
devlink->dpipe_headers = dpipe_headers;
devl_unlock(devlink);
- return 0;
}
EXPORT_SYMBOL_GPL(devlink_dpipe_headers_register);