Commit 896de009 authored by Jason Gunthorpe's avatar Jason Gunthorpe

RDMA/core: Use dev_name instead of ibdev->name

These return the same thing but dev_name is a more conventional use of the
kernel API.
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
parent 5a738b5d
...@@ -4367,7 +4367,7 @@ static void cm_add_one(struct ib_device *ib_device) ...@@ -4367,7 +4367,7 @@ static void cm_add_one(struct ib_device *ib_device)
cm_dev->going_down = 0; cm_dev->going_down = 0;
cm_dev->device = device_create(&cm_class, &ib_device->dev, cm_dev->device = device_create(&cm_class, &ib_device->dev,
MKDEV(0, 0), NULL, MKDEV(0, 0), NULL,
"%s", ib_device->name); "%s", dev_name(&ib_device->dev));
if (IS_ERR(cm_dev->device)) { if (IS_ERR(cm_dev->device)) {
kfree(cm_dev); kfree(cm_dev);
return; return;
......
...@@ -65,7 +65,7 @@ static struct cma_dev_port_group *to_dev_port_group(struct config_item *item) ...@@ -65,7 +65,7 @@ static struct cma_dev_port_group *to_dev_port_group(struct config_item *item)
static bool filter_by_name(struct ib_device *ib_dev, void *cookie) static bool filter_by_name(struct ib_device *ib_dev, void *cookie)
{ {
return !strcmp(ib_dev->name, cookie); return !strcmp(dev_name(&ib_dev->dev), cookie);
} }
static int cma_configfs_params_get(struct config_item *item, static int cma_configfs_params_get(struct config_item *item,
......
...@@ -165,7 +165,7 @@ static struct ib_device *__ib_device_get_by_name(const char *name) ...@@ -165,7 +165,7 @@ static struct ib_device *__ib_device_get_by_name(const char *name)
struct ib_device *device; struct ib_device *device;
list_for_each_entry(device, &device_list, core_list) list_for_each_entry(device, &device_list, core_list)
if (!strncmp(name, device->name, IB_DEVICE_NAME_MAX)) if (!strcmp(name, dev_name(&device->dev)))
return device; return device;
return NULL; return NULL;
...@@ -184,7 +184,7 @@ static int alloc_name(struct ib_device *ibdev, const char *name) ...@@ -184,7 +184,7 @@ static int alloc_name(struct ib_device *ibdev, const char *name)
list_for_each_entry(device, &device_list, core_list) { list_for_each_entry(device, &device_list, core_list) {
char buf[IB_DEVICE_NAME_MAX]; char buf[IB_DEVICE_NAME_MAX];
if (sscanf(device->name, name, &i) != 1) if (sscanf(dev_name(&device->dev), name, &i) != 1)
continue; continue;
if (i < 0 || i >= PAGE_SIZE * 8) if (i < 0 || i >= PAGE_SIZE * 8)
continue; continue;
...@@ -219,9 +219,7 @@ static void ib_device_release(struct device *device) ...@@ -219,9 +219,7 @@ static void ib_device_release(struct device *device)
static int ib_device_uevent(struct device *device, static int ib_device_uevent(struct device *device,
struct kobj_uevent_env *env) struct kobj_uevent_env *env)
{ {
struct ib_device *dev = container_of(device, struct ib_device, dev); if (add_uevent_var(env, "NAME=%s", dev_name(device)))
if (add_uevent_var(env, "NAME=%s", dev->name))
return -ENOMEM; return -ENOMEM;
/* /*
......
...@@ -257,7 +257,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, ...@@ -257,7 +257,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
atomic_set(&pool->flush_ser, 0); atomic_set(&pool->flush_ser, 0);
init_waitqueue_head(&pool->force_wait); init_waitqueue_head(&pool->force_wait);
pool->worker = kthread_create_worker(0, "ib_fmr(%s)", device->name); pool->worker =
kthread_create_worker(0, "ib_fmr(%s)", dev_name(&device->dev));
if (IS_ERR(pool->worker)) { if (IS_ERR(pool->worker)) {
pr_warn(PFX "couldn't start cleanup kthread worker\n"); pr_warn(PFX "couldn't start cleanup kthread worker\n");
ret = PTR_ERR(pool->worker); ret = PTR_ERR(pool->worker);
......
...@@ -509,7 +509,7 @@ static int iw_cm_map(struct iw_cm_id *cm_id, bool active) ...@@ -509,7 +509,7 @@ static int iw_cm_map(struct iw_cm_id *cm_id, bool active)
cm_id->m_local_addr = cm_id->local_addr; cm_id->m_local_addr = cm_id->local_addr;
cm_id->m_remote_addr = cm_id->remote_addr; cm_id->m_remote_addr = cm_id->remote_addr;
memcpy(pm_reg_msg.dev_name, cm_id->device->name, memcpy(pm_reg_msg.dev_name, dev_name(&cm_id->device->dev),
sizeof(pm_reg_msg.dev_name)); sizeof(pm_reg_msg.dev_name));
memcpy(pm_reg_msg.if_name, cm_id->device->iwcm->ifname, memcpy(pm_reg_msg.if_name, cm_id->device->iwcm->ifname,
sizeof(pm_reg_msg.if_name)); sizeof(pm_reg_msg.if_name));
......
...@@ -179,7 +179,8 @@ static int fill_nldev_handle(struct sk_buff *msg, struct ib_device *device) ...@@ -179,7 +179,8 @@ static int fill_nldev_handle(struct sk_buff *msg, struct ib_device *device)
{ {
if (nla_put_u32(msg, RDMA_NLDEV_ATTR_DEV_INDEX, device->index)) if (nla_put_u32(msg, RDMA_NLDEV_ATTR_DEV_INDEX, device->index))
return -EMSGSIZE; return -EMSGSIZE;
if (nla_put_string(msg, RDMA_NLDEV_ATTR_DEV_NAME, device->name)) if (nla_put_string(msg, RDMA_NLDEV_ATTR_DEV_NAME,
dev_name(&device->dev)))
return -EMSGSIZE; return -EMSGSIZE;
return 0; return 0;
......
...@@ -761,7 +761,7 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb, ...@@ -761,7 +761,7 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb,
/* Construct the family header first */ /* Construct the family header first */
header = skb_put(skb, NLMSG_ALIGN(sizeof(*header))); header = skb_put(skb, NLMSG_ALIGN(sizeof(*header)));
memcpy(header->device_name, query->port->agent->device->name, memcpy(header->device_name, dev_name(&query->port->agent->device->dev),
LS_DEVICE_NAME_MAX); LS_DEVICE_NAME_MAX);
header->port_num = query->port->port_num; header->port_num = query->port->port_num;
......
...@@ -685,9 +685,8 @@ static int ib_mad_agent_security_change(struct notifier_block *nb, ...@@ -685,9 +685,8 @@ static int ib_mad_agent_security_change(struct notifier_block *nb,
if (event != LSM_POLICY_CHANGE) if (event != LSM_POLICY_CHANGE)
return NOTIFY_DONE; return NOTIFY_DONE;
ag->smp_allowed = !security_ib_endport_manage_subnet(ag->security, ag->smp_allowed = !security_ib_endport_manage_subnet(
ag->device->name, ag->security, dev_name(&ag->device->dev), ag->port_num);
ag->port_num);
return NOTIFY_OK; return NOTIFY_OK;
} }
...@@ -708,7 +707,7 @@ int ib_mad_agent_security_setup(struct ib_mad_agent *agent, ...@@ -708,7 +707,7 @@ int ib_mad_agent_security_setup(struct ib_mad_agent *agent,
return 0; return 0;
ret = security_ib_endport_manage_subnet(agent->security, ret = security_ib_endport_manage_subnet(agent->security,
agent->device->name, dev_name(&agent->device->dev),
agent->port_num); agent->port_num);
if (ret) if (ret)
return ret; return ret;
......
...@@ -1132,7 +1132,7 @@ static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr, ...@@ -1132,7 +1132,7 @@ static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr,
if (!port) if (!port)
return -ENODEV; return -ENODEV;
return sprintf(buf, "%s\n", port->ib_dev->name); return sprintf(buf, "%s\n", dev_name(&port->ib_dev->dev));
} }
static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL); static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL);
......
...@@ -1179,7 +1179,7 @@ static ssize_t ibdev_show(struct device *device, struct device_attribute *attr, ...@@ -1179,7 +1179,7 @@ static ssize_t ibdev_show(struct device *device, struct device_attribute *attr,
srcu_key = srcu_read_lock(&dev->disassociate_srcu); srcu_key = srcu_read_lock(&dev->disassociate_srcu);
ib_dev = srcu_dereference(dev->ib_dev, &dev->disassociate_srcu); ib_dev = srcu_dereference(dev->ib_dev, &dev->disassociate_srcu);
if (ib_dev) if (ib_dev)
ret = sprintf(buf, "%s\n", ib_dev->name); ret = sprintf(buf, "%s\n", dev_name(&ib_dev->dev));
srcu_read_unlock(&dev->disassociate_srcu, srcu_key); srcu_read_unlock(&dev->disassociate_srcu, srcu_key);
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment