From patchwork Tue Dec 21 23:58:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 12690701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90144C433EF for ; Tue, 21 Dec 2021 23:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235391AbhLUX6y (ORCPT ); Tue, 21 Dec 2021 18:58:54 -0500 Received: from mga01.intel.com ([192.55.52.88]:30626 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230020AbhLUX6y (ORCPT ); Tue, 21 Dec 2021 18:58:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640131134; x=1671667134; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fzwnxaM8qEVZ+xGKSxQj2nrNO5stVmeCjjZyJxAa/8U=; b=Th1kLWblK/ct+zPjoGnP061/RvHeQ4tlh0MZCLm0+U7f+gfb1Ke72P3F KdV0RHKYLQMmQkJ3BYpVA6Ocmy54IlTMypF0vQDhkTHS7f+dN8nLDHja6 6LUC2ikQXLaVxlN6IK97SZ4MII+gxn/kQmnDBvRz0tMM4BhsprMbUb2M0 pTrYLzZA2nZTNJW2PIYI0qGxC5VS/r/Mgz6GVGVDTTZs5PTRN++5p0Afc jqr+3tNFFMZ9+9/oZut2UZBpWWI0y9g88QuAsMD4GWpRI08y1I+KBNwca EJbHqhtYVeQjTg0xBMXjccqrwGQWW2h7S3lDaaPOTy1TBnhH2BGqj2fY1 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10205"; a="264706230" X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="264706230" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2021 15:58:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="521457295" Received: from linux.intel.com ([10.54.29.200]) by orsmga008.jf.intel.com with ESMTP; 21 Dec 2021 15:58:53 -0800 Received: from debox1-desk4.intel.com (unknown [10.209.90.33]) by linux.intel.com (Postfix) with ESMTP id EC2F2580684; Tue, 21 Dec 2021 15:58:52 -0800 (PST) From: "David E. Box" 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" , 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 Message-Id: <20211221235852.323752-2-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211221235852.323752-1-david.e.box@linux.intel.com> References: <20211221235852.323752-1-david.e.box@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers. Signed-off-by: David E. Box --- 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); } From patchwork Tue Dec 21 23:58:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 12690703 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E250C433FE for ; Tue, 21 Dec 2021 23:58:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238503AbhLUX64 (ORCPT ); Tue, 21 Dec 2021 18:58:56 -0500 Received: from mga12.intel.com ([192.55.52.136]:13562 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238387AbhLUX6z (ORCPT ); Tue, 21 Dec 2021 18:58:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640131135; x=1671667135; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uCa5cZIlL8taJeMROqQYvFIGIwU4M7AqBFLrdzGAITk=; b=Jql15cj37nHoXifjn7eb0bUVVLwpf2UmJuu4ObrayMIGTLpjqTsDv/mn OMnoZC/o3DlmgLkviXPF7NuyvJp5R+VOeL/fre0tn1TOrwj8ykV1vEUKR MKJbC7lSohKx4Q/87Lp1QzZ2VTLaEFGNLYrSR5HgETnlwl0IfYs9TekKa hTADHiGWXFxcOQR38Fparh5ae+Qf7thPuPRGid0yOrwGCzJBUG2J5mbHu 317ihAfCR54fDXMggAaCSCxtYSudpbQwhahxjk7RN3sNmiaR1AqvHli1j FbCPHIVVleDuViN2tbGp/0wR6J1hzNn//bYPOQoLQR31wkov+dy62ihby g==; X-IronPort-AV: E=McAfee;i="6200,9189,10205"; a="220524630" X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="220524630" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2021 15:58:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="467976751" Received: from linux.intel.com ([10.54.29.200]) by orsmga006.jf.intel.com with ESMTP; 21 Dec 2021 15:58:53 -0800 Received: from debox1-desk4.intel.com (unknown [10.209.90.33]) by linux.intel.com (Postfix) with ESMTP id 6FBA7580AA4; Tue, 21 Dec 2021 15:58:53 -0800 (PST) From: "David E. Box" 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" , 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 2/4] soundwire: intel: Use auxiliary_device driver data helpers Date: Tue, 21 Dec 2021 15:58:50 -0800 Message-Id: <20211221235852.323752-3-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211221235852.323752-1-david.e.box@linux.intel.com> References: <20211221235852.323752-1-david.e.box@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers. Signed-off-by: David E. Box Reviewed-by: Andy Shevchenko --- drivers/soundwire/intel.c | 8 ++++---- drivers/soundwire/intel_init.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 78037ffdb09b..d082d18e41a9 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1293,7 +1293,7 @@ static int intel_link_probe(struct auxiliary_device *auxdev, bus->ops = &sdw_intel_ops; /* set driver data, accessed by snd_soc_dai_get_drvdata() */ - dev_set_drvdata(dev, cdns); + auxiliary_set_drvdata(auxdev, cdns); /* use generic bandwidth allocation algorithm */ sdw->cdns.bus.compute_params = sdw_compute_params; @@ -1321,7 +1321,7 @@ int intel_link_startup(struct auxiliary_device *auxdev) { struct sdw_cdns_stream_config config; struct device *dev = &auxdev->dev; - struct sdw_cdns *cdns = dev_get_drvdata(dev); + struct sdw_cdns *cdns = auxiliary_get_drvdata(auxdev); struct sdw_intel *sdw = cdns_to_intel(cdns); struct sdw_bus *bus = &cdns->bus; int link_flags; @@ -1463,7 +1463,7 @@ int intel_link_startup(struct auxiliary_device *auxdev) static void intel_link_remove(struct auxiliary_device *auxdev) { struct device *dev = &auxdev->dev; - struct sdw_cdns *cdns = dev_get_drvdata(dev); + struct sdw_cdns *cdns = auxiliary_get_drvdata(auxdev); struct sdw_intel *sdw = cdns_to_intel(cdns); struct sdw_bus *bus = &cdns->bus; @@ -1488,7 +1488,7 @@ int intel_link_process_wakeen_event(struct auxiliary_device *auxdev) void __iomem *shim; u16 wake_sts; - sdw = dev_get_drvdata(dev); + sdw = auxiliary_get_drvdata(auxdev); bus = &sdw->cdns.bus; if (bus->prop.hw_disabled || !sdw->startup_done) { diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c index e329022e1669..d99807765dfe 100644 --- a/drivers/soundwire/intel_init.c +++ b/drivers/soundwire/intel_init.c @@ -244,7 +244,7 @@ static struct sdw_intel_ctx goto err; link = &ldev->link_res; - link->cdns = dev_get_drvdata(&ldev->auxdev.dev); + link->cdns = auxiliary_get_drvdata(&ldev->auxdev); if (!link->cdns) { dev_err(&adev->dev, "failed to get link->cdns\n"); From patchwork Tue Dec 21 23:58:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 12690705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B81DAC4332F for ; Tue, 21 Dec 2021 23:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238669AbhLUX67 (ORCPT ); Tue, 21 Dec 2021 18:58:59 -0500 Received: from mga02.intel.com ([134.134.136.20]:33887 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230020AbhLUX6z (ORCPT ); Tue, 21 Dec 2021 18:58:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640131135; x=1671667135; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HmRnjSHEImGDIXi5qjv2Qcg1JIBqpB9eFo+S1hSnOUM=; b=kmo5lYdC8o3K1lTpp5ZKefvL1TSIE54N0fPlb1rVGrJgJDJ003IBYEol 8ekqhPWzruUHMeq0vMpeL96eo20u/FOjQTOOMxhg97X2IM+uBAZrn0j/u 8/bin3aXbQ7NEQJ6vIEBvQwbcYmjDeE4Rk42YzgSEyW61ypJToiHjmNmA 6y2+Yy3kuPoXPIfOvPa01dxbGNWizKhFdWXuJ2dUSZ5VMXhj0ifD132v/ p+TBfViJ28qSnJHEA4K9aXnSwVFMFw/cNbzzpqKvPYcS/qWjWtGhutdYl ob9DEd7qI8Eqrpw2QfVTWwZJji+OZ9Wxlz69sd9+XREfDftD2d3GZ1XSa g==; X-IronPort-AV: E=McAfee;i="6200,9189,10205"; a="227808274" X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="227808274" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2021 15:58:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="756027347" Received: from linux.intel.com ([10.54.29.200]) by fmsmga006.fm.intel.com with ESMTP; 21 Dec 2021 15:58:54 -0800 Received: from debox1-desk4.intel.com (unknown [10.209.90.33]) by linux.intel.com (Postfix) with ESMTP id ECAF4580684; Tue, 21 Dec 2021 15:58:53 -0800 (PST) From: "David E. Box" 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" , 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 3/4] net/mlx5e: Use auxiliary_device driver data helpers Date: Tue, 21 Dec 2021 15:58:51 -0800 Message-Id: <20211221235852.323752-4-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211221235852.323752-1-david.e.box@linux.intel.com> References: <20211221235852.323752-1-david.e.box@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers. Signed-off-by: David E. Box --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 65571593ec5c..244ce8f4e286 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -5389,7 +5389,7 @@ void mlx5e_destroy_netdev(struct mlx5e_priv *priv) static int mlx5e_resume(struct auxiliary_device *adev) { struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev); - struct mlx5e_priv *priv = dev_get_drvdata(&adev->dev); + struct mlx5e_priv *priv = auxiliary_get_drvdata(adev); struct net_device *netdev = priv->netdev; struct mlx5_core_dev *mdev = edev->mdev; int err; @@ -5412,7 +5412,7 @@ static int mlx5e_resume(struct auxiliary_device *adev) static int mlx5e_suspend(struct auxiliary_device *adev, pm_message_t state) { - struct mlx5e_priv *priv = dev_get_drvdata(&adev->dev); + struct mlx5e_priv *priv = auxiliary_get_drvdata(adev); struct net_device *netdev = priv->netdev; struct mlx5_core_dev *mdev = priv->mdev; @@ -5456,7 +5456,7 @@ static int mlx5e_probe(struct auxiliary_device *adev, mlx5e_build_nic_netdev(netdev); priv = netdev_priv(netdev); - dev_set_drvdata(&adev->dev, priv); + auxiliary_set_drvdata(adev, priv); priv->profile = profile; priv->ppriv = NULL; @@ -5504,7 +5504,7 @@ static int mlx5e_probe(struct auxiliary_device *adev, static void mlx5e_remove(struct auxiliary_device *adev) { - struct mlx5e_priv *priv = dev_get_drvdata(&adev->dev); + struct mlx5e_priv *priv = auxiliary_get_drvdata(adev); pm_message_t state = {}; mlx5e_dcbnl_delete_app(priv); From patchwork Tue Dec 21 23:58:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 12690707 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88B41C433EF for ; Tue, 21 Dec 2021 23:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238611AbhLUX67 (ORCPT ); Tue, 21 Dec 2021 18:58:59 -0500 Received: from mga11.intel.com ([192.55.52.93]:34962 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238438AbhLUX6z (ORCPT ); Tue, 21 Dec 2021 18:58:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640131135; x=1671667135; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hwAfnUoUcPtbNb+Jf+zP6MleLGHe8+qzZXqQsGqVi34=; b=UGnziEqfy5qF2ubW4gq5Mfa88QDPPaRKA08/s7p8e/7y1MARQhtZOL1c ZXdOTOLUchrtj4jPaVmJYuRXwYS8aqLgFynyI+RZuk/rCG+IF0bM/oPts zgUEnTxbSup9wftHQdqIMOVccfKOPn6CgFHd4BZb//BOgooeoEkK8Ixca dp2u4VGH5c1BWbXcmnVlwUjKl2i/X3QI2Y3+4UKbPGdDEWHQBQrHOGoEZ GN3GmlEL+KUfJZ8/2gO2buwxTzYn0vEW0QZfAAMm01cB2+HL2TB0JScE3 W/Rqz7Fwv+yAmsBHBBpOmT/Ol7YFYTKXmj7HjenPos81K2euh5IPaI8rw A==; X-IronPort-AV: E=McAfee;i="6200,9189,10205"; a="238048970" X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="238048970" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2021 15:58:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,224,1635231600"; d="scan'208";a="616944343" Received: from linux.intel.com ([10.54.29.200]) by orsmga004.jf.intel.com with ESMTP; 21 Dec 2021 15:58:54 -0800 Received: from debox1-desk4.intel.com (unknown [10.209.90.33]) by linux.intel.com (Postfix) with ESMTP id 6F4CB5807C5; Tue, 21 Dec 2021 15:58:54 -0800 (PST) From: "David E. Box" 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" , 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 4/4] vdpa/mlx5: Use auxiliary_device driver data helpers Date: Tue, 21 Dec 2021 15:58:52 -0800 Message-Id: <20211221235852.323752-5-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211221235852.323752-1-david.e.box@linux.intel.com> References: <20211221235852.323752-1-david.e.box@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers. Signed-off-by: David E. Box --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 63813fbb5f62..cf59f7e17c6d 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -2683,7 +2683,7 @@ static int mlx5v_probe(struct auxiliary_device *adev, if (err) goto reg_err; - dev_set_drvdata(&adev->dev, mgtdev); + auxiliary_set_drvdata(adev, mgtdev); return 0; @@ -2696,7 +2696,7 @@ static void mlx5v_remove(struct auxiliary_device *adev) { struct mlx5_vdpa_mgmtdev *mgtdev; - mgtdev = dev_get_drvdata(&adev->dev); + mgtdev = auxiliary_get_drvdata(adev); vdpa_mgmtdev_unregister(&mgtdev->mgtdev); kfree(mgtdev); }