ASoC: soc-cache: Fix indentation issues
PATCH 1/2 ASoC: soc-cache: Fix indentation issues
Signed-off-by Dimitris Papastamos <[email protected]>
--- sound/soc/soc-cache.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
sound/soc/soc-cache.c +9 -9
@@ -93,13 +93,13 @@ static unsigned int do_hw_read(struct snd_soc_codec *codec, unsigned int reg) }static unsigned int snd_soc_4_12_read (struct snd_soc_codec *codec, -unsigned int reg) +unsigned int reg) {return do_hw_read (codec, reg); }static int snd_soc_4_12_write (struct snd_soc_codec *codec,unsigned int reg, -unsigned int value) +unsigned int value) {u8 data[2 ];
@@ -111,7 +111,7 @@ static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg,#if defined(CONFIG_SPI_MASTER )static int snd_soc_4_12_spi_write (void *control_data,const char *data, -int len) +int len) {u8 msg[2 ];
@@ -209,7 +209,7 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec,#if defined(CONFIG_SPI_MASTER )static int snd_soc_8_16_spi_write (void *control_data,const char *data, -int len) +int len) {u8 msg[3 ];
@@ -257,7 +257,7 @@ static unsigned int do_i2c_read(struct snd_soc_codec *codec,#if defined(CONFIG_I2C ) || (defined(CONFIG_I2C_MODULE ) && defined(MODULE ))static unsigned int snd_soc_8_8_read_i2c (struct snd_soc_codec *codec, -unsigned int r) +unsigned int r) {u8 reg = r;u8 data;
@@ -307,13 +307,13 @@ static unsigned int snd_soc_16_8_read_i2c(struct snd_soc_codec *codec,#endif static unsigned int snd_soc_16_8_read (struct snd_soc_codec *codec, -unsigned int reg) +unsigned int reg) {return do_hw_read (codec, reg); }static int snd_soc_16_8_write (struct snd_soc_codec *codec,unsigned int reg, -unsigned int value) +unsigned int value) {u8 data[3 ];
@@ -327,7 +327,7 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg,#if defined(CONFIG_SPI_MASTER )static int snd_soc_16_8_spi_write (void *control_data,const char *data, -int len) +int len) {u8 msg[3 ];
@@ -379,7 +379,7 @@ static int snd_soc_16_16_write(struct snd_soc_codec *codec, unsigned int reg,#if defined(CONFIG_SPI_MASTER )static int snd_soc_16_16_spi_write (void *control_data,const char *data, -int len) +int len) {u8 msg[4 ];
Signature · 1 line
1.7.4.1
PATCH 2/2 ASoC: soc-cache: Warn on syncing any non-writable registers
When syncing the cache, if the driver has given us a writable_register() callback, use it to check if we are syncing a non-writable register and if so warn the user.
Signed-off-by Dimitris Papastamos <[email protected]>
--- sound/soc/soc-cache.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
sound/soc/soc-cache.c +6 -0
@@ -661,6 +661,8 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec) rbnode = rb_entry(node, struct snd_soc_rbtree_node, node);if (rbnode->value == rbnode->defval)continue ; +WARN_ON (codec->writable_register && + !codec->writable_register (codec, rbnode->reg)); ret =snd_soc_cache_read (codec, rbnode->reg, &val);if (ret)return ret;
@@ -921,6 +923,8 @@ static int snd_soc_lzo_cache_sync(struct snd_soc_codec *codec) lzo_blocks = codec->reg_cache;for_each_set_bit (i, lzo_blocks[0 ]->sync_bmp, lzo_blocks[0 ]->sync_bmp_nbits) { +WARN_ON (codec->writable_register && + !codec->writable_register (codec, i)); ret =snd_soc_cache_read (codec, i, &val);if (ret)return ret;
@@ -1179,6 +1183,8 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec) codec_drv = codec->driver;for (i =0 ; i < codec_drv->reg_cache_size; ++i) { +WARN_ON (codec->writable_register && + !codec->writable_register (codec, i)); ret =snd_soc_cache_read (codec, i, &val);if (ret)return ret;
Signature · 1 line
1.7.4.1