On 03/13/2014 03:37 PM, Takashi Iwai wrote: [...]
Something broken in this update. Now I get the build errors:
CC [M] sound/soc/codecs/tlv320aic31xx.o sound/soc/codecs/tlv320aic31xx.c: In function ‘aic31xx_clk_off’: sound/soc/codecs/tlv320aic31xx.c:946:23: warning: unused variable ‘aic31xx’ [-Wunused-variable] struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); ^ sound/soc/codecs/tlv320aic31xx.c: In function ‘aic31xx_codec_probe’: sound/soc/codecs/tlv320aic31xx.c:1057:48: error: ‘SND_SOC_REGMAP’ undeclared (first use in this function) ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); ^ sound/soc/codecs/tlv320aic31xx.c:1057:48: note: each undeclared identifier is reported only once for each function it appears in sound/soc/codecs/tlv320aic31xx.c:1057:2: warning: passing argument 2 of ‘snd_soc_codec_set_cache_io’ makes pointer from integer without a cast [enabled by default] ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); ^ In file included from sound/soc/codecs/tlv320aic31xx.c:36:0: include/sound/soc.h:402:5: note: expected ‘struct regmap *’ but argument is of type ‘int’ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, ^ sound/soc/codecs/tlv320aic31xx.c:1057:2: error: too many arguments to function ‘snd_soc_codec_set_cache_io’ ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); ^ In file included from sound/soc/codecs/tlv320aic31xx.c:36:0: include/sound/soc.h:402:5: note: declared here int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, ^ make[3]: *** [sound/soc/codecs/tlv320aic31xx.o] Error 1
Adding Jyri to Cc. Jyri can you send a patch that fixes this up? There was a overlap between your patch and a cleanup that changed the signature of snd_soc_codec_set_cache_io(). Note that you can just drop both the control_data assignment and the snd_soc_codec_set_cache_io() call from your codec probe function since this is now done automatically by the core.
- Lars