From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@sirena.org.uk>
Cc: alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>
Subject: Re: ASoC updates for v3.15
Date: Thu, 13 Mar 2014 15:37:35 +0100 [thread overview]
Message-ID: <s5hd2hqxiz4.wl%tiwai@suse.de> (raw)
In-Reply-To: <20140313142939.GZ366@sirena.org.uk>
At Thu, 13 Mar 2014 14:29:39 +0000,
Mark Brown wrote:
>
> The following changes since commit deeed33850c8a376addabbf971df433b2a1ba74c:
>
> Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/wm9081' and 'asoc/topic/wm9705' into asoc-next (2014-03-12 23:05:31 +0000)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.15-2
>
> for you to fetch changes up to 56fe48976db38ed3984e0e68b71e503e8179dd89:
>
> Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next (2014-03-13 14:19:54 +0000)
>
> ----------------------------------------------------------------
>
> ASoC: Updates for v3.15
>
> This is mostly a few additional fixes from Lars-Peter, a new driver and
> cleaning up a git failure with merging the Intel branch (combined with
> an xargs failure to pay attention to error codes). The history lists a
> bunch of additional commits for the branch but the content of those
> commits is actually present already but not recorded in history due to
> git failing. Unfortunately xargs is used in the merge script and it
> doesn't do a good job of noticing errors from the commands it invokes.
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
Could you queue the fixes and resend a pull request again?
thanks,
Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2014-03-13 14:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 14:29 ASoC updates for v3.15 Mark Brown
2014-03-13 14:37 ` Takashi Iwai [this message]
2014-03-13 15:31 ` Lars-Peter Clausen
2014-03-13 16:13 ` Jyri Sarha
2014-04-09 14:39 Mark Brown
2014-04-09 15:52 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hd2hqxiz4.wl%tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@sirena.org.uk \
--cc=lgirdwood@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).