From: Barry Song <21cnbao@gmail.com>
To: Lars-Peter Clausen <lars@metafoo.de>
Cc: alsa-devel@alsa-project.org, Mike Frysinger <vapier@gentoo.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
device-driver-devel@blackfin.uclinux.org,
uclinux-dist-devel@blackfin.uclinux.org,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: Re: [PATCH 3/4] ASoC: Get rid of snd_soc_*_*_spi_write wrapper functions
Date: Thu, 12 May 2011 20:25:11 +0800 [thread overview]
Message-ID: <BANLkTin5SV8kj8147RZ8_pm4h-cUBQKn_g@mail.gmail.com> (raw)
In-Reply-To: <1304617966-4410-3-git-send-email-lars@metafoo.de>
2011/5/6 Lars-Peter Clausen <lars@metafoo.de>:
> All the different snd_soc_*_*_spi_write functions are nothing but mere wrappers
> around do_spi_write().
> This patch removes them and uses do_spi_write directly as the codecs hw_write
> callback instead.
i don't know whether something has changed. i remember i once wrote
some callbacks due to different hardware register layout or other
hardware issues.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> sound/soc/soc-cache.c | 108 ++-----------------------------------------------
> 1 files changed, 4 insertions(+), 104 deletions(-)
>
> diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
> index 080fab2..f1ee207 100644
> --- a/sound/soc/soc-cache.c
> +++ b/sound/soc/soc-cache.c
> @@ -21,7 +21,7 @@
> #include <trace/events/asoc.h>
>
> #if defined(CONFIG_SPI_MASTER)
> -static int do_spi_write(void *control_data, const void *msg,
> +static int do_spi_write(void *control_data, const char *msg,
> int len)
> {
> struct spi_device *spi = control_data;
> @@ -42,6 +42,8 @@ static int do_spi_write(void *control_data, const void *msg,
>
> return len;
> }
> +#else
> +#define do_spi_write NULL
> #endif
>
> static int do_hw_write(struct snd_soc_codec *codec, unsigned int reg,
> @@ -109,21 +111,6 @@ static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg,
> return do_hw_write(codec, reg, value, data, 2);
> }
>
> -#if defined(CONFIG_SPI_MASTER)
> -static int snd_soc_4_12_spi_write(void *control_data, const char *data,
> - int len)
> -{
> - u8 msg[2];
> -
> - msg[0] = data[0];
> - msg[1] = data[1];
> -
> - return do_spi_write(control_data, msg, len);
> -}
> -#else
> -#define snd_soc_4_12_spi_write NULL
> -#endif
> -
> static unsigned int snd_soc_7_9_read(struct snd_soc_codec *codec,
> unsigned int reg)
> {
> @@ -141,21 +128,6 @@ static int snd_soc_7_9_write(struct snd_soc_codec *codec, unsigned int reg,
> return do_hw_write(codec, reg, value, data, 2);
> }
>
> -#if defined(CONFIG_SPI_MASTER)
> -static int snd_soc_7_9_spi_write(void *control_data, const char *data,
> - int len)
> -{
> - u8 msg[2];
> -
> - msg[0] = data[0];
> - msg[1] = data[1];
> -
> - return do_spi_write(control_data, msg, len);
> -}
> -#else
> -#define snd_soc_7_9_spi_write NULL
> -#endif
> -
> static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg,
> unsigned int value)
> {
> @@ -174,21 +146,6 @@ static unsigned int snd_soc_8_8_read(struct snd_soc_codec *codec,
> return do_hw_read(codec, reg);
> }
>
> -#if defined(CONFIG_SPI_MASTER)
> -static int snd_soc_8_8_spi_write(void *control_data, const char *data,
> - int len)
> -{
> - u8 msg[2];
> -
> - msg[0] = data[0];
> - msg[1] = data[1];
> -
> - return do_spi_write(control_data, msg, len);
> -}
> -#else
> -#define snd_soc_8_8_spi_write NULL
> -#endif
> -
> static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
> unsigned int value)
> {
> @@ -207,22 +164,6 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec,
> return do_hw_read(codec, reg);
> }
>
> -#if defined(CONFIG_SPI_MASTER)
> -static int snd_soc_8_16_spi_write(void *control_data, const char *data,
> - int len)
> -{
> - u8 msg[3];
> -
> - msg[0] = data[0];
> - msg[1] = data[1];
> - msg[2] = data[2];
> -
> - return do_spi_write(control_data, msg, len);
> -}
> -#else
> -#define snd_soc_8_16_spi_write NULL
> -#endif
> -
> #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
> static unsigned int do_i2c_read(struct snd_soc_codec *codec,
> void *reg, int reglen,
> @@ -324,22 +265,6 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg,
> return do_hw_write(codec, reg, value, data, 3);
> }
>
> -#if defined(CONFIG_SPI_MASTER)
> -static int snd_soc_16_8_spi_write(void *control_data, const char *data,
> - int len)
> -{
> - u8 msg[3];
> -
> - msg[0] = data[0];
> - msg[1] = data[1];
> - msg[2] = data[2];
> -
> - return do_spi_write(control_data, msg, len);
> -}
> -#else
> -#define snd_soc_16_8_spi_write NULL
> -#endif
> -
> #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
> static unsigned int snd_soc_16_16_read_i2c(struct snd_soc_codec *codec,
> unsigned int r)
> @@ -376,23 +301,6 @@ static int snd_soc_16_16_write(struct snd_soc_codec *codec, unsigned int reg,
> return do_hw_write(codec, reg, value, data, 4);
> }
>
> -#if defined(CONFIG_SPI_MASTER)
> -static int snd_soc_16_16_spi_write(void *control_data, const char *data,
> - int len)
> -{
> - u8 msg[4];
> -
> - msg[0] = data[0];
> - msg[1] = data[1];
> - msg[2] = data[2];
> - msg[3] = data[3];
> -
> - return do_spi_write(control_data, msg, len);
> -}
> -#else
> -#define snd_soc_16_16_spi_write NULL
> -#endif
> -
> /* Primitive bulk write support for soc-cache. The data pointed to by
> * `data' needs to already be in the form the hardware expects
> * including any leading register specific data. Any data written
> @@ -440,43 +348,36 @@ static struct {
> int addr_bits;
> int data_bits;
> int (*write)(struct snd_soc_codec *codec, unsigned int, unsigned int);
> - int (*spi_write)(void *, const char *, int);
> unsigned int (*read)(struct snd_soc_codec *, unsigned int);
> unsigned int (*i2c_read)(struct snd_soc_codec *, unsigned int);
> } io_types[] = {
> {
> .addr_bits = 4, .data_bits = 12,
> .write = snd_soc_4_12_write, .read = snd_soc_4_12_read,
> - .spi_write = snd_soc_4_12_spi_write,
> },
> {
> .addr_bits = 7, .data_bits = 9,
> .write = snd_soc_7_9_write, .read = snd_soc_7_9_read,
> - .spi_write = snd_soc_7_9_spi_write,
> },
> {
> .addr_bits = 8, .data_bits = 8,
> .write = snd_soc_8_8_write, .read = snd_soc_8_8_read,
> .i2c_read = snd_soc_8_8_read_i2c,
> - .spi_write = snd_soc_8_8_spi_write,
> },
> {
> .addr_bits = 8, .data_bits = 16,
> .write = snd_soc_8_16_write, .read = snd_soc_8_16_read,
> .i2c_read = snd_soc_8_16_read_i2c,
> - .spi_write = snd_soc_8_16_spi_write,
> },
> {
> .addr_bits = 16, .data_bits = 8,
> .write = snd_soc_16_8_write, .read = snd_soc_16_8_read,
> .i2c_read = snd_soc_16_8_read_i2c,
> - .spi_write = snd_soc_16_8_spi_write,
> },
> {
> .addr_bits = 16, .data_bits = 16,
> .write = snd_soc_16_16_write, .read = snd_soc_16_16_read,
> .i2c_read = snd_soc_16_16_read_i2c,
> - .spi_write = snd_soc_16_16_spi_write,
> },
> };
>
> @@ -537,8 +438,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
> break;
>
> case SND_SOC_SPI:
> - if (io_types[i].spi_write)
> - codec->hw_write = io_types[i].spi_write;
> + codec->hw_write = do_spi_write;
>
> codec->control_data = container_of(codec->dev,
> struct spi_device,
> --
> 1.7.2.5
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2011-05-12 12:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-05 17:52 [PATCH 1/4] Blackfin: Use 8bit spi transfers for the ad1836 Lars-Peter Clausen
2011-05-05 17:52 ` [PATCH 2/4] ASoC: Do not swap upper and lower byte in snd_soc_4_12_spi_write Lars-Peter Clausen
2011-05-05 17:52 ` [PATCH 3/4] ASoC: Get rid of snd_soc_*_*_spi_write wrapper functions Lars-Peter Clausen
2011-05-12 12:25 ` Barry Song [this message]
2011-05-05 17:52 ` [PATCH 4/4] ASoC: Use spi_write in do_spi_write Lars-Peter Clausen
2011-05-05 22:56 ` [uclinux-dist-devel] [PATCH 1/4] Blackfin: Use 8bit spi transfers for the ad1836 Mike Frysinger
2011-05-06 12:28 ` Lars-Peter Clausen
2011-05-06 12:48 ` Mark Brown
2011-05-06 13:12 ` [Device-drivers-devel] " Mike Frysinger
2011-05-06 13:19 ` Lars-Peter Clausen
2011-05-06 13:26 ` Mark Brown
2011-05-06 13:31 ` Lars-Peter Clausen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTin5SV8kj8147RZ8_pm4h-cUBQKn_g@mail.gmail.com \
--to=21cnbao@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=device-driver-devel@blackfin.uclinux.org \
--cc=lars@metafoo.de \
--cc=lrg@slimlogic.co.uk \
--cc=uclinux-dist-devel@blackfin.uclinux.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).