[PATCH 1/2] ASoC: Automatically determine control_data for soc-cache users

* [PATCH 1/2] ASoC: Automatically determine control_data for soc-cache users
@ 2010-08-12  9:59 Mark Brown
  2010-08-12  9:59 ` [PATCH 2/2] ASoC: Remove -dai suffix from Samsung DAI devices Mark Brown
  2010-08-12 10:04 ` [PATCH 2/2] ASoC: Remove unneeded control_data management from Wolfson drivers Mark Brown
  0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2010-08-12  9:59 UTC (permalink / raw)
  To: Liam Girdwood; +Cc: alsa-devel, Mark Brown

Since the provision of a struct device for the CODEC is now mandatory
we can use container_of() to locate the struct i2c_client and struct
spi_device for relevant devices, removing the need to manually set it
in each driver.

A further patch will automate selection of the control type based on
the bus_type of the struct device, further reducing the amount of
driver code required.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/soc-cache.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 83cd8ed..b856177 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -584,11 +584,19 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 #endif
 		if (io_types[i].i2c_read)
 			codec->hw_read = io_types[i].i2c_read;
+
+		codec->control_data = container_of(codec->dev,
+						   struct i2c_client,
+						   dev);
 		break;
 
 	case SND_SOC_SPI:
 		if (io_types[i].spi_write)
 			codec->hw_write = io_types[i].spi_write;
+
+		codec->control_data = container_of(codec->dev,
+						   struct spi_device,
+						   dev);
 		break;
 	}
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread