diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-01-20 13:04:30 -0800 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-01-24 12:26:17 -0500 |
| commit | db97ed0a2edfb2903c790d86e15d15baa1edf95d (patch) | |
| tree | d6d6425c38babb67f3c273b6038e29fd9cece428 /drivers/infiniband | |
| parent | 85e9f1dbbd1422805fb83bd391fc8ebba1087591 (diff) | |
| download | linux-stable-db97ed0a2edfb2903c790d86e15d15baa1edf95d.tar.gz linux-stable-db97ed0a2edfb2903c790d86e15d15baa1edf95d.tar.bz2 linux-stable-db97ed0a2edfb2903c790d86e15d15baa1edf95d.zip | |
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>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c index 7b6d40ff1acf..bac455a1942d 100644 --- 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 ee32a2a87e2d..6fdfa1a7a0ae 100644 --- 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); |