Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Leon Romanovsky and committed by
David S. Miller
6db9350a b20b54fb

+3 -145
-32
drivers/net/netdevsim/health.c
··· 110 110 if (err) 111 111 return err; 112 112 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 - } 133 113 err = devlink_fmsg_arr_pair_nest_end(fmsg); 134 114 if (err) 135 115 return err; ··· 119 139 return err; 120 140 for (i = 0; i < 10; i++) { 121 141 err = devlink_fmsg_u32_put(fmsg, i); 122 - if (err) 123 - return err; 124 - } 125 - err = devlink_fmsg_arr_pair_nest_end(fmsg); 126 - if (err) 127 - return err; 128 - 129 - err = devlink_fmsg_arr_pair_nest_start(fmsg, "test_u64_array"); 130 - if (err) 131 - return err; 132 - for (i = 0; i < 10; i++) { 133 - err = devlink_fmsg_u64_put(fmsg, i); 134 142 if (err) 135 143 return err; 136 144 }
-14
include/net/devlink.h
··· 1663 1663 union devlink_param_value *init_val); 1664 1664 int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id, 1665 1665 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); 1673 1666 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); 1678 1667 struct devlink_region * 1679 1668 devlink_region_create(struct devlink *devlink, 1680 1669 const struct devlink_region_ops *ops, ··· 1708 1719 const char *name); 1709 1720 int devlink_fmsg_binary_pair_nest_end(struct devlink_fmsg *fmsg); 1710 1721 1711 - int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value); 1712 - int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value); 1713 1722 int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value); 1714 - int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value); 1715 1723 int devlink_fmsg_string_put(struct devlink_fmsg *fmsg, const char *value); 1716 1724 int devlink_fmsg_binary_put(struct devlink_fmsg *fmsg, const void *value, 1717 1725 u16 value_len);
+3 -99
net/core/devlink.c
··· 6269 6269 return 0; 6270 6270 } 6271 6271 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) 6273 6273 { 6274 6274 if (fmsg->putting_binary) 6275 6275 return -EINVAL; 6276 6276 6277 6277 return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_FLAG); 6278 6278 } 6279 - EXPORT_SYMBOL_GPL(devlink_fmsg_bool_put); 6280 6279 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) 6282 6281 { 6283 6282 if (fmsg->putting_binary) 6284 6283 return -EINVAL; 6285 6284 6286 6285 return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_U8); 6287 6286 } 6288 - EXPORT_SYMBOL_GPL(devlink_fmsg_u8_put); 6289 6287 6290 6288 int devlink_fmsg_u32_put(struct devlink_fmsg *fmsg, u32 value) 6291 6289 { ··· 6294 6296 } 6295 6297 EXPORT_SYMBOL_GPL(devlink_fmsg_u32_put); 6296 6298 6297 - int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value) 6299 + static int devlink_fmsg_u64_put(struct devlink_fmsg *fmsg, u64 value) 6298 6300 { 6299 6301 if (fmsg->putting_binary) 6300 6302 return -EINVAL; 6301 6303 6302 6304 return devlink_fmsg_put_value(fmsg, &value, sizeof(value), NLA_U64); 6303 6305 } 6304 - EXPORT_SYMBOL_GPL(devlink_fmsg_u64_put); 6305 6306 6306 6307 int devlink_fmsg_string_put(struct devlink_fmsg *fmsg, const char *value) 6307 6308 { ··· 10255 10258 EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_set); 10256 10259 10257 10260 /** 10258 - * devlink_port_param_driverinit_value_get - get configuration parameter 10259 - * value for driver initializing 10260 - * 10261 - * @devlink_port: devlink_port 10262 - * @param_id: parameter ID 10263 - * @init_val: value of parameter in driverinit configuration mode 10264 - * 10265 - * This function should be used by the driver to get driverinit 10266 - * configuration for initialization after reload command. 10267 - */ 10268 - int devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port, 10269 - u32 param_id, 10270 - union devlink_param_value *init_val) 10271 - { 10272 - struct devlink *devlink = devlink_port->devlink; 10273 - 10274 - if (!devlink_reload_supported(devlink->ops)) 10275 - return -EOPNOTSUPP; 10276 - 10277 - return __devlink_param_driverinit_value_get(&devlink_port->param_list, 10278 - param_id, init_val); 10279 - } 10280 - EXPORT_SYMBOL_GPL(devlink_port_param_driverinit_value_get); 10281 - 10282 - /** 10283 - * devlink_port_param_driverinit_value_set - set value of configuration 10284 - * parameter for driverinit 10285 - * configuration mode 10286 - * 10287 - * @devlink_port: devlink_port 10288 - * @param_id: parameter ID 10289 - * @init_val: value of parameter to set for driverinit configuration mode 10290 - * 10291 - * This function should be used by the driver to set driverinit 10292 - * configuration mode default value. 10293 - */ 10294 - int devlink_port_param_driverinit_value_set(struct devlink_port *devlink_port, 10295 - u32 param_id, 10296 - union devlink_param_value init_val) 10297 - { 10298 - return __devlink_param_driverinit_value_set(devlink_port->devlink, 10299 - devlink_port->index, 10300 - &devlink_port->param_list, 10301 - param_id, init_val, 10302 - DEVLINK_CMD_PORT_PARAM_NEW); 10303 - } 10304 - EXPORT_SYMBOL_GPL(devlink_port_param_driverinit_value_set); 10305 - 10306 - /** 10307 10261 * devlink_param_value_changed - notify devlink on a parameter's value 10308 10262 * change. Should be called by the driver 10309 10263 * right after the change. ··· 10276 10328 devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW); 10277 10329 } 10278 10330 EXPORT_SYMBOL_GPL(devlink_param_value_changed); 10279 - 10280 - /** 10281 - * devlink_port_param_value_changed - notify devlink on a parameter's value 10282 - * change. Should be called by the driver 10283 - * right after the change. 10284 - * 10285 - * @devlink_port: devlink_port 10286 - * @param_id: parameter ID 10287 - * 10288 - * This function should be used by the driver to notify devlink on value 10289 - * change, excluding driverinit configuration mode. 10290 - * For driverinit configuration mode driver should use the function 10291 - * devlink_port_param_driverinit_value_set() instead. 10292 - */ 10293 - void devlink_port_param_value_changed(struct devlink_port *devlink_port, 10294 - u32 param_id) 10295 - { 10296 - struct devlink_param_item *param_item; 10297 - 10298 - param_item = devlink_param_find_by_id(&devlink_port->param_list, 10299 - param_id); 10300 - WARN_ON(!param_item); 10301 - 10302 - devlink_param_notify(devlink_port->devlink, devlink_port->index, 10303 - param_item, DEVLINK_CMD_PORT_PARAM_NEW); 10304 - } 10305 - EXPORT_SYMBOL_GPL(devlink_port_param_value_changed); 10306 - 10307 - /** 10308 - * devlink_param_value_str_fill - Safely fill-up the string preventing 10309 - * from overflow of the preallocated buffer 10310 - * 10311 - * @dst_val: destination devlink_param_value 10312 - * @src: source buffer 10313 - */ 10314 - void devlink_param_value_str_fill(union devlink_param_value *dst_val, 10315 - const char *src) 10316 - { 10317 - size_t len; 10318 - 10319 - len = strlcpy(dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE); 10320 - WARN_ON(len >= __DEVLINK_PARAM_MAX_STRING_VALUE); 10321 - } 10322 - EXPORT_SYMBOL_GPL(devlink_param_value_str_fill); 10323 10331 10324 10332 /** 10325 10333 * devlink_region_create - create a new address region