aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorBard Liao <bardliao@realtek.com>2014-04-07 23:18:10 -0400
committerMark Brown <broonie@linaro.org>2014-04-14 12:23:39 -0400
commit1a39019e939f620f39a1b914231ab6ba9013b208 (patch)
treeb620abc9b41893a422be05dc050215cec46f532e /include/sound/soc.h
parentb318ad503698160183fe5e0752b9a1bb3e558026 (diff)
ASoC: core: Allow snd_soc_update_bits use 32 bits register
Change reg's type from unsigned short to unsigned int. So that we can use 32 bits reg value in snd_soc_update_bits. Signed-off-by: Bard Liao <bardliao@realtek.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0b83168d8ff4..4ed706bf11d1 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -469,12 +469,12 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
469#endif 469#endif
470 470
471/* codec register bit access */ 471/* codec register bit access */
472int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, 472int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
473 unsigned int mask, unsigned int value); 473 unsigned int mask, unsigned int value);
474int snd_soc_update_bits_locked(struct snd_soc_codec *codec, 474int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
475 unsigned short reg, unsigned int mask, 475 unsigned int reg, unsigned int mask,
476 unsigned int value); 476 unsigned int value);
477int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, 477int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
478 unsigned int mask, unsigned int value); 478 unsigned int mask, unsigned int value);
479 479
480int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, 480int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,