RE: [PATCH 18/21] ASoC: da7219: fix endianness issues

From: Adam Thomson
Date: Mon Jan 07 2019 - 08:27:09 EST


On 05 January 2019 02:03, Pierre-Louis Bossart wrote:

> Reported by Sparse.
>
> da7219.c:440:44: warning: cast to restricted __le16
> da7219.c:461:13: warning: incorrect type in assignment (different base types)
> da7219.c:461:13: expected unsigned short [unsigned] [usertype] val
> da7219.c:461:13: got restricted __le16 [usertype] <noident>
> da7219.c:1451:16: warning: incorrect type in assignment (different base types)
> da7219.c:1451:16: expected unsigned short [unsigned] [usertype] offset
> da7219.c:1451:16: got restricted __le16 [usertype] <noident>
>
> da7219-aad.c:150:37: warning: incorrect type in assignment (different base types)
> da7219-aad.c:150:37: expected unsigned short [unsigned] [usertype]
> tonegen_freq_hptest
> da7219-aad.c:150:37: got restricted __le16 [usertype] <noident>
> da7219-aad.c:157:37: warning: incorrect type in assignment (different base types)
> da7219-aad.c:157:37: expected unsigned short [unsigned] [usertype]
> tonegen_freq_hptest
> da7219-aad.c:157:37: got restricted __le16 [usertype] <noident>
>
> Cc: Adam Thomson <Adam.Thomson.Opensource@xxxxxxxxxxx>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>

Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@xxxxxxxxxxx>

> ---
> sound/soc/codecs/da7219-aad.c | 2 +-
> sound/soc/codecs/da7219.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.c
> index 2c7d5088e6f2..e0964b20a389 100644
> --- a/sound/soc/codecs/da7219-aad.c
> +++ b/sound/soc/codecs/da7219-aad.c
> @@ -117,7 +117,7 @@ static void da7219_aad_hptest_work(struct work_struct
> *work)
> struct snd_soc_dapm_context *dapm =
> snd_soc_component_get_dapm(component);
> struct da7219_priv *da7219 =
> snd_soc_component_get_drvdata(component);
>
> - u16 tonegen_freq_hptest;
> + __le16 tonegen_freq_hptest;
> u8 pll_srm_sts, pll_ctrl, gain_ramp_ctrl, accdet_cfg8;
> int report = 0, ret = 0;
>
> diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index
> e46e9f4bc994..ce165047b9f9 100644
> --- a/sound/soc/codecs/da7219.c
> +++ b/sound/soc/codecs/da7219.c
> @@ -423,7 +423,7 @@ static int da7219_tonegen_freq_get(struct snd_kcontrol
> *kcontrol,
> struct soc_mixer_control *mixer_ctrl =
> (struct soc_mixer_control *) kcontrol->private_value;
> unsigned int reg = mixer_ctrl->reg;
> - u16 val;
> + __le16 val;
> int ret;
>
> mutex_lock(&da7219->ctrl_lock);
> @@ -450,7 +450,7 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol
> *kcontrol,
> struct soc_mixer_control *mixer_ctrl =
> (struct soc_mixer_control *) kcontrol->private_value;
> unsigned int reg = mixer_ctrl->reg;
> - u16 val;
> + __le16 val;
> int ret;
>
> /*
> @@ -1396,7 +1396,7 @@ static int da7219_set_dai_tdm_slot(struct snd_soc_dai
> *dai,
> struct snd_soc_component *component = dai->component;
> struct da7219_priv *da7219 =
> snd_soc_component_get_drvdata(component);
> u8 dai_bclks_per_wclk;
> - u16 offset;
> + __le16 offset;
> u32 frame_size;
>
> /* No channels enabled so disable TDM, revert to 64-bit frames */
> --
> 2.17.1