RDMA/irdma: Use auxiliary_device driver data helpers

Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Link: https://lore.kernel.org/r/20211221235852.323752-2-david.e.box@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/infiniband/hw/irdma/main.c b/drivers/infiniband/hw/irdma/main.c
index 51a41359e0b41a1ff72b4a75d28a2d63fad4277a..9ccf4d683f8a6381eabdcbf4045c1c579dc5a585 100644 (file)
--- a/drivers/infiniband/hw/irdma/main.c
+++ b/drivers/infiniband/hw/irdma/main.c
@@ -207,7 +207,7 @@ static void irdma_remove(struct auxiliary_device *aux_dev)
                                                            struct iidc_auxiliary_dev,
                                                            adev);
        struct ice_pf *pf = iidc_adev->pf;
-       struct irdma_device *iwdev = dev_get_drvdata(&aux_dev->dev);
+       struct irdma_device *iwdev = auxiliary_get_drvdata(aux_dev);
 
        irdma_ib_unregister_device(iwdev);
        ice_rdma_update_vsi_filter(pf, iwdev->vsi_num, false);
@@ -294,7 +294,7 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_
        ice_rdma_update_vsi_filter(pf, iwdev->vsi_num, true);
 
        ibdev_dbg(&iwdev->ibdev, "INIT: Gen2 PF[%d] device probe success\n", PCI_FUNC(rf->pcidev->devfn));
-       dev_set_drvdata(&aux_dev->dev, iwdev);
+       auxiliary_set_drvdata(aux_dev, iwdev);
 
        return 0;
 

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 5ec8bd2f0b2ff3d3bac092546318cd3a8baafb82..85f526c861e9bdb687e6d0aa51562e158df3f2c3 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -4422,7 +4422,7 @@ static int mlx5r_mp_probe(struct auxiliary_device *adev,
        }
        mutex_unlock(&mlx5_ib_multiport_mutex);
 
-       dev_set_drvdata(&adev->dev, mpi);
+       auxiliary_set_drvdata(adev, mpi);
        return 0;
 }
 
@@ -4430,7 +4430,7 @@ static void mlx5r_mp_remove(struct auxiliary_device *adev)
 {
        struct mlx5_ib_multiport_info *mpi;
 
-       mpi = dev_get_drvdata(&adev->dev);
+       mpi = auxiliary_get_drvdata(adev);
        mutex_lock(&mlx5_ib_multiport_mutex);
        if (mpi->ibdev)
                mlx5_ib_unbind_slave_port(mpi->ibdev, mpi);
@@ -4480,7 +4480,7 @@ static int mlx5r_probe(struct auxiliary_device *adev,
                return ret;
        }
 
-       dev_set_drvdata(&adev->dev, dev);
+       auxiliary_set_drvdata(adev, dev);
        return 0;
 }
 
@@ -4488,7 +4488,7 @@ static void mlx5r_remove(struct auxiliary_device *adev)
 {
        struct mlx5_ib_dev *dev;
 
-       dev = dev_get_drvdata(&adev->dev);
+       dev = auxiliary_get_drvdata(adev);
        __mlx5_ib_remove(dev, dev->profile, MLX5_IB_STAGE_MAX);
 }