IB/IPoIB: 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>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
index 7b6d40ff1acf8e3a80269a713705e20655def9da..bac455a1942d9cef723efd9060bfcf3288842e5b 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -65,7 +65,7 @@ static void ipoib_get_drvinfo(struct net_device *netdev,
        ib_get_device_fw_str(priv->ca, drvinfo->fw_version,
                             sizeof(drvinfo->fw_version));
 
-       strlcpy(drvinfo->bus_info, dev_name(priv->ca->dma_device),
+       strlcpy(drvinfo->bus_info, dev_name(priv->ca->dev.parent),
                sizeof(drvinfo->bus_info));
 
        strlcpy(drvinfo->version, ipoib_driver_version,

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index ee32a2a87e2d274a2bc3861615ec951e73b7d44a..6fdfa1a7a0aeee1bdbaa7d2dc5e76c6994458fb7 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -2022,7 +2022,7 @@ static struct net_device *ipoib_add_port(const char *format,
        if (!priv)
                goto alloc_mem_failed;
 
-       SET_NETDEV_DEV(priv->dev, hca->dma_device);
+       SET_NETDEV_DEV(priv->dev, hca->dev.parent);
        priv->dev->dev_id = port - 1;
 
        result = ib_query_port(hca, port, &attr);