Commit 85fe0b32 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

devlink: make devlink_param_driverinit_value_set() return void 



devlink_param_driverinit_value_set() currently returns int with possible
error, but no user is checking it anyway. The only reason for a fail is
a driver bug. So convert the function to return void and put WARN_ONs
on error paths.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6fd6eda0

include/net/devlink.h

+2 −2
Original line number Diff line number Diff line
@@ -1775,7 +1775,7 @@ void devlink_params_unregister(struct devlink *devlink, 
			       size_t params_count);

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,

void devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,

					union devlink_param_value init_val);

void devlink_param_value_changed(struct devlink *devlink, u32 param_id);

struct devlink_region *devl_region_create(struct devlink *devlink,

net/devlink/leftover.c

+7 −8
Original line number Diff line number Diff line
@@ -10931,18 +10931,18 @@ EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_get); 
 *	This function should be used by the driver to set driverinit

 *	configuration mode default value.

 */

int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,

void devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,

					union devlink_param_value init_val)

{

	struct devlink_param_item *param_item;



	param_item = devlink_param_find_by_id(&devlink->param_list, param_id);

	if (!param_item)

		return -EINVAL;

	if (WARN_ON(!param_item))

		return;



	if (!devlink_param_cmode_is_supported(param_item->param,

					      DEVLINK_PARAM_CMODE_DRIVERINIT))

		return -EOPNOTSUPP;

	if (WARN_ON(!devlink_param_cmode_is_supported(param_item->param,

						      DEVLINK_PARAM_CMODE_DRIVERINIT)))

		return;



	if (param_item->param->type == DEVLINK_PARAM_TYPE_STRING)

		strcpy(param_item->driverinit_value.vstr, init_val.vstr);
@@ -10951,7 +10951,6 @@ int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id, 
	param_item->driverinit_value_valid = true;



	devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);

	return 0;

}

EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_set);