Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 123c3def authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: da7219: fix endianness issues 



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@diasemi.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d61780c1

sound/soc/codecs/da7219-aad.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/da7219.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */