Skip to content

Commit 6db9350

Browse files
rleondavem330
rleon
authored and
davem330
committed
devlink: Delete not-used devlink APIs
Devlink core exported generously the functions calls that were used by netdevsim tests or not used at all. Delete such APIs with one exception - devlink_alloc_ns(). That function should be spared from deleting because it is a special form of devlink_alloc() needed for the netdevsim. Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Acked-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b20b54f commit 6db9350

File tree

3 files changed

+3
-145
lines changed

3 files changed

+3
-145
lines changed

‎drivers/net/netdevsim/health.c‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -110,26 +110,6 @@ static int nsim_dev_dummy_fmsg_put(struct devlink_fmsg *fmsg, u32 binary_len)
110110
if (err)
111111
return err;
112112

113-
err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_bool_array");
114-
if (err)
115-
return err;
116-
for (i = 0; i < 10; i++) {
117-
err = devlink_fmsg_bool_put(fmsg, true);
118-
if (err)
119-
return err;
120-
}
121-
err = devlink_fmsg_arr_pair_nest_end(fmsg);
122-
if (err)
123-
return err;
124-
125-
err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_u8_array");
126-
if (err)
127-
return err;
128-
for (i = 0; i < 10; i++) {
129-
err = devlink_fmsg_u8_put(fmsg, i);
130-
if (err)
131-
return err;
132-
}
133113
err = devlink_fmsg_arr_pair_nest_end(fmsg);
134114
if (err)
135115
return err;
@@ -146,18 +126,6 @@ static int nsim_dev_dummy_fmsg_put(struct devlink_fmsg *fmsg, u32 binary_len)
146126
if (err)
147127
return err;
148128

149-
err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_u64_array");
150-
if (err)
151-
return err;
152-
for (i = 0; i < 10; i++) {
153-
err = devlink_fmsg_u64_put(fmsg, i);
154-
if (err)
155-
return err;
156-
}
157-
err = devlink_fmsg_arr_pair_nest_end(fmsg);
158-
if (err)
159-
return err;
160-
161129
err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_array_of_objects");
162130
if (err)
163131
return err;

‎include/net/devlink.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,18 +1663,7 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,
16631663
union devlink_param_value *init_val);
16641664
int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,
16651665
union devlink_param_value init_val);
1666-
int
1667-
devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port,
1668-
u32 param_id,
1669-
union devlink_param_value *init_val);
1670-
int devlink_port_param_driverinit_value_set(struct devlink_port *devlink_port,
1671-
u32 param_id,
1672-
union devlink_param_value init_val);
16731666
void devlink_param_value_changed(struct devlink *devlink, u32 param_id);
1674-
void devlink_port_param_value_changed(struct devlink_port *devlink_port,
1675-
u32 param_id);
1676-
void devlink_param_value_str_fill(union devlink_param_value *dst_val,
1677-
const char *src);
16781667
struct devlink_region *
16791668
devlink_region_create(struct devlink *devlink,
16801669
const struct devlink_region_ops *ops,
@@ -1719,10 +1708,7 @@ int devlink_fmsg_binary_pair_nest_start(struct devlink_fmsg *fmsg,
17191708
const char *name);
17201709
int devlink_fmsg_binary_pair_nest_end(struct devlink_fmsg *fmsg);
17211710

1722-
int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value);
1723-
int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value);
17241711
int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value);
1725-
int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value);
17261712
int devlink_fmsg_string_put(struct devlink_fmsg *fmsg, const char *value);
17271713
int devlink_fmsg_binary_put(struct devlink_fmsg *fmsg, const void *value,
17281714
u16 value_len);

‎net/core/devlink.c‎

Lines changed: 3 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -6269,23 +6269,21 @@ static int devlink_fmsg_put_value(struct devlink_fmsg *fmsg,
62696269
return 0;
62706270
}
62716271

6272-
int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value)
6272+
static int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value)
62736273
{
62746274
if (fmsg->putting_binary)
62756275
return -EINVAL;
62766276

62776277
return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_FLAG);
62786278
}
6279-
EXPORT_SYMBOL_GPL(devlink_fmsg_bool_put);
62806279

6281-
int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value)
6280+
static int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value)
62826281
{
62836282
if (fmsg->putting_binary)
62846283
return -EINVAL;
62856284

62866285
return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_U8);
62876286
}
6288-
EXPORT_SYMBOL_GPL(devlink_fmsg_u8_put);
62896287

62906288
int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value)
62916289
{
@@ -6296,14 +6294,13 @@ int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value)
62966294
}
62976295
EXPORT_SYMBOL_GPL(devlink_fmsg_u32_put);
62986296

6299-
int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value)
6297+
static int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value)
63006298
{
63016299
if (fmsg->putting_binary)
63026300
return -EINVAL;
63036301

63046302
return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_U64);
63056303
}
6306-
EXPORT_SYMBOL_GPL(devlink_fmsg_u64_put);
63076304

63086305
int devlink_fmsg_string_put(struct devlink_fmsg *fmsg, const char *value)
63096306
{
@@ -10257,55 +10254,6 @@ int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,
1025710254
}
1025810255
EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_set);
1025910256

10260-
/**
10261-
* devlink_port_param_driverinit_value_get - get configuration parameter
10262-
* value for driver initializing
10263-
*
10264-
* @devlink_port: devlink_port
10265-
* @param_id: parameter ID
10266-
* @init_val: value of parameter in driverinit configuration mode
10267-
*
10268-
* This function should be used by the driver to get driverinit
10269-
* configuration for initialization after reload command.
10270-
*/
10271-
int devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port,
10272-
u32 param_id,
10273-
union devlink_param_value *init_val)
10274-
{
10275-
struct devlink *devlink = devlink_port->devlink;
10276-
10277-
if (!devlink_reload_supported(devlink->ops))
10278-
return -EOPNOTSUPP;
10279-
10280-
return __devlink_param_driverinit_value_get(&devlink_port->param_list,
10281-
param_id, init_val);
10282-
}
10283-
EXPORT_SYMBOL_GPL(devlink_port_param_driverinit_value_get);
10284-
10285-
/**
10286-
* devlink_port_param_driverinit_value_set - set value of configuration
10287-
* parameter for driverinit
10288-
* configuration mode
10289-
*
10290-
* @devlink_port: devlink_port
10291-
* @param_id: parameter ID
10292-
* @init_val: value of parameter to set for driverinit configuration mode
10293-
*
10294-
* This function should be used by the driver to set driverinit
10295-
* configuration mode default value.
10296-
*/
10297-
int devlink_port_param_driverinit_value_set(struct devlink_port *devlink_port,
10298-
u32 param_id,
10299-
union devlink_param_value init_val)
10300-
{
10301-
return __devlink_param_driverinit_value_set(devlink_port->devlink,
10302-
devlink_port->index,
10303-
&devlink_port->param_list,
10304-
param_id, init_val,
10305-
DEVLINK_CMD_PORT_PARAM_NEW);
10306-
}
10307-
EXPORT_SYMBOL_GPL(devlink_port_param_driverinit_value_set);
10308-
1030910257
/**
1031010258
* devlink_param_value_changed - notify devlink on a parameter's value
1031110259
* change. Should be called by the driver
@@ -10329,50 +10277,6 @@ void devlink_param_value_changed(struct devlink *devlink, u32 param_id)
1032910277
}
1033010278
EXPORT_SYMBOL_GPL(devlink_param_value_changed);
1033110279

10332-
/**
10333-
* devlink_port_param_value_changed - notify devlink on a parameter's value
10334-
* change. Should be called by the driver
10335-
* right after the change.
10336-
*
10337-
* @devlink_port: devlink_port
10338-
* @param_id: parameter ID
10339-
*
10340-
* This function should be used by the driver to notify devlink on value
10341-
* change, excluding driverinit configuration mode.
10342-
* For driverinit configuration mode driver should use the function
10343-
* devlink_port_param_driverinit_value_set() instead.
10344-
*/
10345-
void devlink_port_param_value_changed(struct devlink_port *devlink_port,
10346-
u32 param_id)
10347-
{
10348-
struct devlink_param_item *param_item;
10349-
10350-
param_item = devlink_param_find_by_id(&devlink_port->param_list,
10351-
param_id);
10352-
WARN_ON(!param_item);
10353-
10354-
devlink_param_notify(devlink_port->devlink, devlink_port->index,
10355-
param_item, DEVLINK_CMD_PORT_PARAM_NEW);
10356-
}
10357-
EXPORT_SYMBOL_GPL(devlink_port_param_value_changed);
10358-
10359-
/**
10360-
* devlink_param_value_str_fill - Safely fill-up the string preventing
10361-
* from overflow of the preallocated buffer
10362-
*
10363-
* @dst_val: destination devlink_param_value
10364-
* @src: source buffer
10365-
*/
10366-
void devlink_param_value_str_fill(union devlink_param_value *dst_val,
10367-
const char *src)
10368-
{
10369-
size_t len;
10370-
10371-
len = strlcpy(dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE);
10372-
WARN_ON(len >= __DEVLINK_PARAM_MAX_STRING_VALUE);
10373-
}
10374-
EXPORT_SYMBOL_GPL(devlink_param_value_str_fill);
10375-
1037610280
/**
1037710281
* devlink_region_create - create a new address region
1037810282
*

0 commit comments

Comments
 (0)