aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-24 09:05:25 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 09:14:31 -0500
commit181e055e6bed80afbf8ba2bb5e3ce84fbd3f633c (patch)
tree44aa6d4b6df78a39fd937f6ae25b8e7a269293a7
parent86c3304181a25f127e46c864dc735e21f24484fc (diff)
ASoC: Fix type for snd_soc_volatile_register()
We generally refer to registers as unsigned ints (including in the underlying CODEC driver operation). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--include/sound/soc.h3
-rw-r--r--sound/soc/soc-core.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index c184f84a354c..1355ef029d82 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -267,7 +267,8 @@ int snd_soc_register_codec(struct device *dev,
267 const struct snd_soc_codec_driver *codec_drv, 267 const struct snd_soc_codec_driver *codec_drv,
268 struct snd_soc_dai_driver *dai_drv, int num_dai); 268 struct snd_soc_dai_driver *dai_drv, int num_dai);
269void snd_soc_unregister_codec(struct device *dev); 269void snd_soc_unregister_codec(struct device *dev);
270int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg); 270int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
271 unsigned int reg);
271int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, 272int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
272 int addr_bits, int data_bits, 273 int addr_bits, int data_bits,
273 enum snd_soc_control_type control); 274 enum snd_soc_control_type control);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b0e7689159c1..14861f95f629 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2029,7 +2029,8 @@ static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
2029 * 2029 *
2030 * Boolean function indiciating if a CODEC register is volatile. 2030 * Boolean function indiciating if a CODEC register is volatile.
2031 */ 2031 */
2032int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg) 2032int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
2033 unsigned int reg)
2033{ 2034{
2034 if (codec->volatile_register) 2035 if (codec->volatile_register)
2035 return codec->volatile_register(codec, reg); 2036 return codec->volatile_register(codec, reg);