RDMA: Introduce and use rdma_device_to_ibdev()

[linux.git] / drivers / infiniband / hw / mlx4 / main.c

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index c3f950d82ed02e11d7560c5ec3f1ce9822951e4d..dc2ffd293a1137e4c9dfac31202888d87233b783 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -2043,7 +2043,7 @@ static ssize_t hca_type_show(struct device *device,
                             struct device_attribute *attr, char *buf)
 {
        struct mlx4_ib_dev *dev =
-               container_of(device, struct mlx4_ib_dev, ib_dev.dev);
+               rdma_device_to_drv_device(device, struct mlx4_ib_dev, ib_dev);
        return sprintf(buf, "MT%d\n", dev->dev->persist->pdev->device);
 }
 static DEVICE_ATTR_RO(hca_type);
@@ -2052,7 +2052,7 @@ static ssize_t hw_rev_show(struct device *device,
                           struct device_attribute *attr, char *buf)
 {
        struct mlx4_ib_dev *dev =
-               container_of(device, struct mlx4_ib_dev, ib_dev.dev);
+               rdma_device_to_drv_device(device, struct mlx4_ib_dev, ib_dev);
        return sprintf(buf, "%x\n", dev->dev->rev_id);
 }
 static DEVICE_ATTR_RO(hw_rev);
@@ -2061,7 +2061,8 @@ static ssize_t board_id_show(struct device *device,
                             struct device_attribute *attr, char *buf)
 {
        struct mlx4_ib_dev *dev =
-               container_of(device, struct mlx4_ib_dev, ib_dev.dev);
+               rdma_device_to_drv_device(device, struct mlx4_ib_dev, ib_dev);
+
        return sprintf(buf, "%.*s\n", MLX4_BOARD_ID_LEN,
                       dev->dev->board_id);
 }