2014-02-19 05:21:52

by Nenghua Cao

Subject: [PATCH 2/2] asoc: soc-core: use regmap's parse_val to do endian translation

From: Nenghua Cao <[email protected]>

In snd_soc_bytes_put function, it forces cpu to do cpu_to_be translation,
but for mmio bus which uses REGMAP_ENDIAN_NATIVE, it doesn't need to do
endian translation. So it is better to use regmap's api which can decide
if this translation is needed according to bus configuration.

Signed-off-by: Nenghua Cao <[email protected]>
---
sound/soc/soc-core.c | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fe1df50..fb598cb 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3234,7 +3234,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
struct soc_bytes *params = (void *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
int ret, len;
- unsigned int val;
+ unsigned int val, mask;
void *data;

if (!codec->using_regmap)
@@ -3264,12 +3264,36 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
((u8 *)data)[0] |= val;
break;
case 2:
- ((u16 *)data)[0] &= cpu_to_be16(~params->mask);
- ((u16 *)data)[0] |= cpu_to_be16(val);
+ mask = ~params->mask;
+ ret = regmap_parse_val(codec->control_data,
+ &mask, &mask);
+ if (ret != 0)
+ goto out;
+
+ ((u16 *)data)[0] &= mask;
+
+ ret = regmap_parse_val(codec->control_data,
+ &val, &val);
+ if (ret != 0)
+ goto out;
+
+ ((u16 *)data)[0] |= val;
break;
case 4:
- ((u32 *)data)[0] &= cpu_to_be32(~params->mask);
- ((u32 *)data)[0] |= cpu_to_be32(val);
+ mask = ~params->mask;
+ ret = regmap_parse_val(codec->control_data,
+ &mask, &mask);
+ if (ret != 0)
+ goto out;
+
+ ((u32 *)data)[0] &= mask;
+
+ ret = regmap_parse_val(codec->control_data,
+ &val, &val);
+ if (ret != 0)
+ goto out;
+
+ ((u32 *)data)[0] |= val;
break;
default:
ret = -EINVAL;
--
1.7.0.4

2014-02-19 05:30:57

by Nenghua Cao

Subject: Re: [PATCH 2/2] asoc: soc-core: use regmap's parse_val to do endian translation

Update Liam and Mark's mail.

On 02/19/2014 01:20 PM, Nenghua Cao wrote:
> From: Nenghua Cao <[email protected]>
>
> In snd_soc_bytes_put function, it forces cpu to do cpu_to_be translation,
> but for mmio bus which uses REGMAP_ENDIAN_NATIVE, it doesn't need to do
> endian translation. So it is better to use regmap's api which can decide
> if this translation is needed according to bus configuration.
>
> Signed-off-by: Nenghua Cao <[email protected]>
> ---
> sound/soc/soc-core.c | 34 +++++++++++++++++++++++++++++-----
> 1 files changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index fe1df50..fb598cb 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -3234,7 +3234,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
> struct soc_bytes *params = (void *)kcontrol->private_value;
> struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
> int ret, len;
> - unsigned int val;
> + unsigned int val, mask;
> void *data;
>
> if (!codec->using_regmap)
> @@ -3264,12 +3264,36 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
> ((u8 *)data)[0] |= val;
> break;
> case 2:
> - ((u16 *)data)[0] &= cpu_to_be16(~params->mask);
> - ((u16 *)data)[0] |= cpu_to_be16(val);
> + mask = ~params->mask;
> + ret = regmap_parse_val(codec->control_data,
> + &mask, &mask);
> + if (ret != 0)
> + goto out;
> +
> + ((u16 *)data)[0] &= mask;
> +
> + ret = regmap_parse_val(codec->control_data,
> + &val, &val);
> + if (ret != 0)
> + goto out;
> +
> + ((u16 *)data)[0] |= val;
> break;
> case 4:
> - ((u32 *)data)[0] &= cpu_to_be32(~params->mask);
> - ((u32 *)data)[0] |= cpu_to_be32(val);
> + mask = ~params->mask;
> + ret = regmap_parse_val(codec->control_data,
> + &mask, &mask);
> + if (ret != 0)
> + goto out;
> +
> + ((u32 *)data)[0] &= mask;
> +
> + ret = regmap_parse_val(codec->control_data,
> + &val, &val);
> + if (ret != 0)
> + goto out;
> +
> + ((u32 *)data)[0] |= val;
> break;
> default:
> ret = -EINVAL;
>