On Tue, Dec 21, 2021 at 03:58:50PM -0800, David E. Box wrote:

Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers.

Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com

Signed-off-by: David E. Box david.e.box@linux.intel.com

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");

-- 2.25.1