ASoC: Convert 16x16 write to use cpu_to_be16()
PATCH 1/4 ASoC: Convert 16x16 write to use cpu_to_be16()
Make it clear what we're doing.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-cache.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
sound/soc/soc-cache.c +4 -6
@@ -277,14 +277,12 @@ static unsigned int snd_soc_16_16_read(struct snd_soc_codec *codec,static int snd_soc_16_16_write (struct snd_soc_codec *codec,unsigned int reg,unsigned int value) { -u8 data[4 ]; +u16 data[2 ]; - data[0 ] = (reg >>8 ) &0xff ; - data[1 ] = reg &0xff ; - data[2 ] = (value >>8 ) &0xff ; - data[3 ] = value &0xff ; + data[0 ] =cpu_to_be16 (reg); + data[1 ] =cpu_to_be16 (value); -return do_hw_write (codec, reg, value, data,4 ); +return do_hw_write (codec, reg, value, data,sizeof (data)); }/* Primitive bulk write support for soc-cache. The data pointed to by
Signature · 1 line
1.7.5.1
PATCH 2/4 ASoC: Convert 7x9 write to use cpu_to_be16()
Run the data through cpu_to_be16() so it's at least clear what we're up to.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-cache.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
sound/soc/soc-cache.c +3 -4
@@ -107,12 +107,11 @@ static unsigned int snd_soc_7_9_read(struct snd_soc_codec *codec,static int snd_soc_7_9_write (struct snd_soc_codec *codec,unsigned int reg,unsigned int value) { -u8 data[2 ]; +u16 data; - data[0 ] = (reg <<1 ) | ((value >>8 ) &0x0001 ); - data[1 ] = value &0x00ff ; + data =cpu_to_be16 ((reg <<9 ) | (value &0x1ff )); -return do_hw_write (codec, reg, value, data,2 ); +return do_hw_write (codec, reg, value, &data,2 ); } static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg,
Signature · 1 line
1.7.5.1
PATCH 3/4 ASoC: Use cpu_to_be16() in 8x16 write
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/soc-cache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-cache.c +2 -2
@@ -136,10 +136,10 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) {u8 data[3 ]; +u16 val =cpu_to_be16 (value); data[0 ] = reg; - data[1 ] = (value >>8 ) &0xff ; - data[2 ] = value &0xff ; +memcpy (&data[1 ], &val,sizeof (val));return do_hw_write (codec, reg, value, data,3 ); }
Signature · 1 line
1.7.5.1
PATCH 4/4 ASoC: Use explicit endianness conversion in snd_soc_16_8_write()
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/soc-cache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-cache.c +2 -2
@@ -242,9 +242,9 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) {u8 data[3 ]; +u16 rval =cpu_to_be16 (reg); - data[0 ] = (reg >>8 ) &0xff ; - data[1 ] = reg &0xff ; +memcpy (data, &rval,sizeof (rval)); data[2 ] = value;return do_hw_write (codec, reg, value, data,3 );
Signature · 1 line
1.7.5.1
Quoted 4 lines · Mark Brown
Make it clear what we're doing.
Signed-off-by Mark Brown <[email protected]>---
All
Acked-by Liam Girdwood <[email protected]>