diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-01-20 13:04:13 -0800 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-01-24 12:23:35 -0500 |
| commit | 97a9ea848016fef86e4a42dc6a65f4384eed32cd (patch) | |
| tree | 29739706ac1a5718bd7ba49fd4ffaae0d9dce779 /drivers/infiniband/core/device.c | |
| parent | 5f0cb80134a0035829bf7580126ea371c4aefec5 (diff) | |
| download | linux-97a9ea848016fef86e4a42dc6a65f4384eed32cd.tar.bz2 | |
IB/core: Initialize ib_device.dev.parent earlier
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>
Diffstat (limited to 'drivers/infiniband/core/device.c')
| -rw-r--r-- | drivers/infiniband/core/device.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 571974cd3919..d543c4390447 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -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, '%')) { |