* [PATCH] ASoC: Don't use codec->control_data in bulk write
@ 2011-06-13 17:54 Mark Brown
2011-06-13 18:02 ` Liam Girdwood
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2011-06-13 17:54 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
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>
---
sound/soc/soc-io.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index fbea6c9..cca490c 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:
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: Don't use codec->control_data in bulk write
2011-06-13 17:54 [PATCH] ASoC: Don't use codec->control_data in bulk write Mark Brown
@ 2011-06-13 18:02 ` Liam Girdwood
0 siblings, 0 replies; 2+ messages in thread
From: Liam Girdwood @ 2011-06-13 18:02 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com
On 13/06/11 18:54, Mark Brown wrote:
> 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>
> ---
> sound/soc/soc-io.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
> index fbea6c9..cca490c 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:
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-13 18:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-13 17:54 [PATCH] ASoC: Don't use codec->control_data in bulk write Mark Brown
2011-06-13 18:02 ` Liam Girdwood
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.