Skip to content

Commit

Permalink
net: devlink: remove devlink_info_driver_name_put()
Browse files Browse the repository at this point in the history
Now that the core sets the driver name attribute, drivers are not
supposed to call devlink_info_driver_name_put() anymore. Remove it.

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
  • Loading branch information
vincent-mailhol authored and intel-lab-lkp committed Nov 27, 2022
1 parent 8cb5881 commit 32018f6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
2 changes: 0 additions & 2 deletions include/net/devlink.h
Expand Up @@ -1746,8 +1746,6 @@ int devlink_region_snapshot_create(struct devlink_region *region,
u8 *data, u32 snapshot_id);
int devlink_info_serial_number_put(struct devlink_info_req *req,
const char *sn);
int devlink_info_driver_name_put(struct devlink_info_req *req,
const char *name);
int devlink_info_board_serial_number_put(struct devlink_info_req *req,
const char *bsn);

Expand Down
11 changes: 2 additions & 9 deletions net/core/devlink.c
Expand Up @@ -6633,14 +6633,6 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
return err;
}

int devlink_info_driver_name_put(struct devlink_info_req *req, const char *name)
{
if (!req->msg)
return 0;
return nla_put_string(req->msg, DEVLINK_ATTR_INFO_DRIVER_NAME, name);
}
EXPORT_SYMBOL_GPL(devlink_info_driver_name_put);

int devlink_info_serial_number_put(struct devlink_info_req *req, const char *sn)
{
if (!req->msg)
Expand Down Expand Up @@ -6756,7 +6748,8 @@ static int devlink_nl_driver_info_get(struct device_driver *drv,
return 0;

if (drv->name[0])
return devlink_info_driver_name_put(req, drv->name);
return nla_put_string(req->msg, DEVLINK_ATTR_INFO_DRIVER_NAME,
drv->name);

return 0;
}
Expand Down

0 comments on commit 32018f6

Please sign in to comment.