summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-11 19:25:42 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-15 08:50:59 -0700
commitf7391fce6a1553ed3375ee4d73f2deaa3fd69732 (patch)
treea92dca2322e6c07ced600cec1da27bc2f3fef0f2
parentd5e4b0adf6e694f9a8fb31f51fc381bd8be17eae (diff)
downloadop-kernel-dev-f7391fce6a1553ed3375ee4d73f2deaa3fd69732.zip
op-kernel-dev-f7391fce6a1553ed3375ee4d73f2deaa3fd69732.tar.gz
ASoC: Reintroduce do_spi_write()
There is an unfortunate difference in return values between spi_write() and i2c_master_send() so we need an adaptor function to translate. Reported-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
-rw-r--r--sound/soc/soc-cache.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 01e5b98..06b7b81 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -20,6 +20,20 @@
#include <trace/events/asoc.h>
+#ifdef CONFIG_SPI_MASTER
+static int do_spi_write(void *control, const char *data, int len)
+{
+ struct spi_device *spi = control;
+ int ret;
+
+ ret = spi_write(spi, data, len);
+ if (ret < 0)
+ return ret;
+
+ return len;
+}
+#endif
+
static int do_hw_write(struct snd_soc_codec *codec, unsigned int reg,
unsigned int value, const void *data, int len)
{
@@ -412,7 +426,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
case SND_SOC_SPI:
#ifdef CONFIG_SPI_MASTER
- codec->hw_write = (hw_write_t)spi_write;
+ codec->hw_write = do_spi_write;
#endif
codec->control_data = container_of(codec->dev,
OpenPOWER on IntegriCloud