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

Commit 181e055e authored Jan 24, 2011 by Mark Brown

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>

parent 86c33041

include/sound/soc.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -267,7 +267,8 @@ int snd_soc_register_codec(struct device *dev,
	const struct snd_soc_codec_driver *codec_drv,		const struct snd_soc_codec_driver *codec_drv,
	struct snd_soc_dai_driver *dai_drv, int num_dai);		struct snd_soc_dai_driver *dai_drv, int num_dai);
	void snd_soc_unregister_codec(struct device *dev);		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 snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
	int addr_bits, int data_bits,		int addr_bits, int data_bits,
	enum snd_soc_control_type control);		enum snd_soc_control_type control);

sound/soc/soc-core.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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.		* 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)		if (codec->volatile_register)
	return codec->volatile_register(codec, reg);		return codec->volatile_register(codec, reg);