瀏覽代碼

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>
Bart Van Assche 8 年之前
父節點
當前提交
db97ed0a2e
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
  2. 1 1
      drivers/infiniband/ulp/ipoib/ipoib_main.c

+ 1 - 1
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,

+ 1 - 1
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);