mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

IB/core: Initialize ib_device.dev.parent earlier

Browse source 
Move the ib_device.dev.parent initialization code from
ib_device_register_sysfs() to ib_register_device(). Additionally,
allow HBA drivers to set ib_device.dev.parent without setting
ib_device.dma_device. This is the first step towards removing
ib_device.dma_device.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Bart Van Assche 2017-01-20 13:04:13 -08:00 committed by Doug Ledford
parent 5f0cb80134
commit 97a9ea8480
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/infiniband/core/device.c
View file

@ -334,6 +334,14 @@ int ib_register_device(struct ib_device *device,
struct ib_client *client;
struct ib_udata uhw = {.outlen = 0, .inlen = 0};
WARN_ON_ONCE(!device->dev.parent && !device->dma_device);
WARN_ON_ONCE(device->dev.parent && device->dma_device
&& device->dev.parent != device->dma_device);
if (!device->dev.parent)
device->dev.parent = device->dma_device;
if (!device->dma_device)
device->dma_device = device->dev.parent;
mutex_lock(&device_mutex);
if (strchr(device->name, '%')) {

2
drivers/infiniband/core/sysfs.c
View file

@ -1258,7 +1258,7 @@ int ib_device_register_sysfs(struct ib_device *device,
int ret;
int i;
device->dev.parent = device->dma_device;
WARN_ON_ONCE(!device->dev.parent);
ret = dev_set_name(class_dev, "%s", device->name);
if (ret)
return ret;