git/linux-net
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/ synced 2026-05-02 18:15:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

RDMA/core: Use dev_err/dbg/etc instead of pr_* + ibdev->name

Browse Source 
Any messages related to a device should be printed with the dev_*
formatters. This provides greater consistency for the user.

The core does not set pr_fmt so this has no significant change.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
This commit is contained in:
Jason Gunthorpe
2018-09-20 16:42:23 -06:00
parent e349f858d2
commit 43c7c851b9
6 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/infiniband/core/device.c
View File

@@ -123,8 +123,9 @@ static int ib_device_check_mandatory(struct ib_device *device)
for (i = 0; i < ARRAY_SIZE(mandatory_table); ++i) {
if (!*(void **) ((void *) device + mandatory_table[i].offset)) {
pr_warn("Device %s is missing mandatory function %s\n",
device->name, mandatory_table[i].name);
dev_warn(&device->dev,
"Device is missing mandatory function %s\n",
mandatory_table[i].name);
return -EINVAL;
}
}
@@ -513,20 +514,21 @@ int ib_register_device(struct ib_device *device, const char *name,
ret = read_port_immutable(device);
if (ret) {
pr_warn("Couldn't create per port immutable data %s\n",
device->name);
dev_warn(&device->dev,
"Couldn't create per port immutable data\n");
goto out;
}
ret = setup_port_pkey_list(device);
if (ret) {
pr_warn("Couldn't create per port_pkey_list\n");
dev_warn(&device->dev, "Couldn't create per port_pkey_list\n");
goto out;
}
ret = ib_cache_setup_one(device);
if (ret) {
pr_warn("Couldn't set up InfiniBand P_Key/GID cache\n");
dev_warn(&device->dev,
"Couldn't set up InfiniBand P_Key/GID cache\n");
goto port_cleanup;
}
@@ -534,21 +536,23 @@ int ib_register_device(struct ib_device *device, const char *name,
ret = ib_device_register_rdmacg(device);
if (ret) {
pr_warn("Couldn't register device with rdma cgroup\n");
dev_warn(&device->dev,
"Couldn't register device with rdma cgroup\n");
goto cache_cleanup;
}
memset(&device->attrs, 0, sizeof(device->attrs));
ret = device->query_device(device, &device->attrs, &uhw);
if (ret) {
pr_warn("Couldn't query the device attributes\n");
dev_warn(&device->dev,
"Couldn't query the device attributes\n");
goto cg_cleanup;
}
ret = ib_device_register_sysfs(device, port_callback);
if (ret) {
pr_warn("Couldn't register device %s with driver model\n",
device->name);
dev_warn(&device->dev,
"Couldn't register device with driver model\n");
goto cg_cleanup;
}
@@ -699,8 +703,9 @@ void ib_unregister_client(struct ib_client *client)
found_context->data : NULL);
if (!found_context) {
pr_warn("No client context found for %s/%s\n",
device->name, client->name);
dev_warn(&device->dev,
"No client context found for %s\n",
client->name);
continue;
}
@@ -764,8 +769,8 @@ void ib_set_client_data(struct ib_device *device, struct ib_client *client,
goto out;
}
pr_warn("No client context found for %s/%s\n",
device->name, client->name);
dev_warn(&device->dev, "No client context found for %s\n",
client->name);
out:
write_unlock_irqrestore(&device->client_data_lock, flags);