IB/hfi1: Switch from dma_device to dev.parent

Prepare for removal of ib_device.dma_device.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
Cc: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 6e595af..09cda3c 100644 (file)
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -4406,7 +4406,7 @@ int hfi1_process_mad(struct ib_device *ibdev, int mad_flags, u8 port,
        switch (in_mad->base_version) {
        case OPA_MGMT_BASE_VERSION:
                if (unlikely(in_mad_size != sizeof(struct opa_mad))) {
-                       dev_err(ibdev->dma_device, "invalid in_mad_size\n");
+                       dev_err(ibdev->dev.parent, "invalid in_mad_size\n");
                        return IB_MAD_RESULT_FAILURE;
                }
                return hfi1_process_opa_mad(ibdev, mad_flags, port,

diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 95ed4d6..2c9efae 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -1784,7 +1784,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
        strlcpy(ibdev->name + lcpysz, "_%d", IB_DEVICE_NAME_MAX - lcpysz);
        ibdev->owner = THIS_MODULE;
        ibdev->phys_port_cnt = dd->num_pports;
-       ibdev->dma_device = &dd->pcidev->dev;
+       ibdev->dev.parent = &dd->pcidev->dev;
        ibdev->modify_device = modify_device;
        ibdev->alloc_hw_stats = alloc_hw_stats;
        ibdev->get_hw_stats = get_hw_stats;