Update Liam and Mark's mail. On 02/19/2014 01:20 PM, Nenghua Cao wrote: > From: Nenghua Cao <nh...@marvell.com> > > 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 <nh...@marvell.com> > --- > 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; >
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
