From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liam Girdwood Subject: Re: [PATCH] ASoC: Don't use codec->control_data in bulk write Date: Mon, 13 Jun 2011 19:02:20 +0100 Message-ID: <4DF650AC.6030102@ti.com> References: <1307987659-2823-1-git-send-email-broonie@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by alsa0.perex.cz (Postfix) with ESMTP id 8EEF124362 for ; Mon, 13 Jun 2011 20:02:26 +0200 (CEST) In-Reply-To: <1307987659-2823-1-git-send-email-broonie@opensource.wolfsonmicro.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: "alsa-devel@alsa-project.org" , "patches@opensource.wolfsonmicro.com" List-Id: alsa-devel@alsa-project.org 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 > --- > 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