Commit 3edac08e authored by David E. Box's avatar David E. Box Committed by Greg Kroah-Hartman
Browse files

soundwire: intel: Use auxiliary_device driver data helpers 



Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Link: https://lore.kernel.org/r/20211221235852.323752-3-david.e.box@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27963d3d

drivers/soundwire/intel.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {

drivers/soundwire/intel_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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");