From: "David E. Box" <david.e.box@linux.intel.com>
To: gregkh@linuxfoundation.org, mustafa.ismail@intel.com,
shiraz.saleem@intel.com, dledford@redhat.com, jgg@ziepe.ca,
leon@kernel.org, saeedm@nvidia.com, davem@davemloft.net,
kuba@kernel.org, vkoul@kernel.org,
yung-chuan.liao@linux.intel.com,
pierre-louis.bossart@linux.intel.com, mst@redhat.com,
jasowang@redhat.com
Cc: "David E. Box" <david.e.box@linux.intel.com>,
andriy.shevchenko@linux.intel.com, hdegoede@redhat.com,
virtualization@lists.linux-foundation.org,
alsa-devel@alsa-project.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org
Subject: [PATCH 1/4] RDMA/irdma: Use auxiliary_device driver data helpers
Date: Tue, 21 Dec 2021 15:58:49 -0800 [thread overview]
Message-ID: <20211221235852.323752-2-david.e.box@linux.intel.com> (raw)
In-Reply-To: <20211221235852.323752-1-david.e.box@linux.intel.com>
Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers.
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
drivers/infiniband/hw/irdma/main.c | 4 ++--
drivers/infiniband/hw/mlx5/main.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/hw/irdma/main.c b/drivers/infiniband/hw/irdma/main.c
index 51a41359e0b4..9ccf4d683f8a 100644
--- 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 5ec8bd2f0b2f..85f526c861e9 100644
--- 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);
}
--
2.25.1
next prev parent reply other threads:[~2021-12-21 23:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 23:58 [PATCH 0/4] driver_core: Auxiliary drvdata helper cleanup David E. Box
2021-12-21 23:58 ` David E. Box [this message]
2021-12-22 12:27 ` [PATCH 1/4] RDMA/irdma: Use auxiliary_device driver data helpers Cezary Rojewski
2021-12-21 23:58 ` [PATCH 2/4] soundwire: intel: " David E. Box
2021-12-22 11:18 ` Andy Shevchenko
2021-12-21 23:58 ` [PATCH 3/4] net/mlx5e: " David E. Box
2021-12-21 23:58 ` [PATCH 4/4] vdpa/mlx5: " David E. Box
2021-12-22 0:09 ` [PATCH 0/4] driver_core: Auxiliary drvdata helper cleanup Jason Gunthorpe
2021-12-22 0:48 ` David E. Box
2021-12-22 17:18 ` Jason Gunthorpe
2021-12-22 12:34 ` Cezary Rojewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211221235852.323752-2-david.e.box@linux.intel.com \
--to=david.e.box@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=jasowang@redhat.com \
--cc=jgg@ziepe.ca \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mst@redhat.com \
--cc=mustafa.ismail@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=saeedm@nvidia.com \
--cc=shiraz.saleem@intel.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).