ASoC: Fix type for snd_soc_volatile_register()
PATCH 1/1 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 <[email protected]>
--- include/sound/soc.h | 3 ++- sound/soc/soc-core.c | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-)
include/sound/soc.h +2 -1
@@ -267,7 +267,8 @@ int snd_soc_register_codec(struct device *dev,const struct snd_soc_codec_driver *codec_drv, struct snd_soc_dai_driver *dai_drv, int num_dai);void snd_soc_unregister_codec (struct device *dev); -int snd_soc_codec_volatile_register (struct snd_soc_codec *codec,int reg); +int snd_soc_codec_volatile_register (struct snd_soc_codec *codec, +unsigned int reg);int snd_soc_codec_set_cache_io (struct snd_soc_codec *codec,int addr_bits,int data_bits,enum snd_soc_control_type control);
sound/soc/soc-core.c +21 -1
@@ -2029,7 +2029,8 @@ static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)* * Boolean function indiciating if a CODEC register is volatile. */ -int snd_soc_codec_volatile_register (struct snd_soc_codec *codec,int reg) +int snd_soc_codec_volatile_register (struct snd_soc_codec *codec, +unsigned int reg) {if (codec->volatile_register)return codec->volatile_register (codec, reg);
@@ -2039,6 +2040,25 @@ int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg)EXPORT_SYMBOL_GPL (snd_soc_codec_volatile_register);/** +* snd_soc_codec_register_name: Return a plain text register name +* +* @codec: CODEC to query. +* @reg: Register to query for. +* +* Returns a string with a plain text name for the register, or NULL +* if none is available. +*/ +const char *snd_soc_codec_register_name (struct snd_soc_codec *codec, +unsigned int reg) +{ +if (codec->volatile_register) +return codec->register_name (codec, reg); +else +return NULL ; +} +EXPORT_SYMBOL_GPL (snd_soc_codec_register_name); + +/** * snd_soc_new_ac97_codec - initailise AC97 device * @codec: audio codec * @ops: AC97 bus operations
Signature · 1 line
1.7.2.3
sound/soc/soc-core.c int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg) · line 2043
Quoted 10 lines · Mark Brown
We generally refer to registers as unsigned ints (including in the underlying CODEC driver operation).
Signed-off-by Mark Brown <[email protected]>sound/soc/soc-core.c +1
-0@@ -2039,6 +2040,25 @@ int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg)EXPORT_SYMBOL_GPL (snd_soc_codec_volatile_register);/** +* snd_soc_codec_register_name: Return a plain text register name
Gah, clearly this shouldn't be here.