From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 13 Jun 2011 17:44:52 +0000 (+0100)
Subject: ASoC: Don't use codec->control_data in bulk write
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=223157121404a7ca4deaf2aa31a57cad8d133d07;p=linux-beck.git

ASoC: Don't use codec->control_data in bulk write

In order to facilitate merging with the register map I/O replace the use
of control_data for the bulk writes with direct lookup of the client data
from the device.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
---

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 855e5cde2793..df9338aa1a52 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -269,12 +269,12 @@ static int snd_soc_hw_bulk_write_raw(struct snd_soc_codec *codec, unsigned int r
 	switch (codec->control_type) {
 #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
 	case SND_SOC_I2C:
-		ret = i2c_master_send(codec->control_data, data, len);
+		ret = i2c_master_send(to_i2c_client(codec->dev), data, len);
 		break;
 #endif
 #if defined(CONFIG_SPI_MASTER)
 	case SND_SOC_SPI:
-		ret = spi_write(codec->control_data, data, len);
+		ret = spi_write(to_spi_device(codec->dev), data, len);
 		break;
 #endif
 	default: