* linux-next: sound tree build failure
@ 2008-10-31 3:41 Stephen Rothwell
2008-10-31 6:39 ` Takashi Iwai
2008-10-31 20:49 ` Troy Kisky
0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2008-10-31 3:41 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, Troy Kisky
Hi Takashi,
Today's linux-next build (x86_64 allmodconfig) failed like this:
sound/soc/soc-dapm.c: In function 'snd_soc_dapm_sys_add':
sound/soc/soc-dapm.c:828: error: 'ret' undeclared (first use in this function)
Caused by commit 12ef193d5817504621e503e78d641265f6a86ac4 ("ASoC: Allow
setting codec register with debugfs filesystem") which removed the
declaration.
I applied the following patch. More care required.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 31 Oct 2008 14:39:03 +1100
Subject: [PATCH] ALSA: restore removeed variable declaration
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
sound/soc/soc-dapm.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 407092c..7bf3c40 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -822,6 +822,8 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);
int snd_soc_dapm_sys_add(struct device *dev)
{
+ int ret;
+
if (!dapm_status)
return 0;
--
1.5.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: linux-next: sound tree build failure 2008-10-31 3:41 linux-next: sound tree build failure Stephen Rothwell @ 2008-10-31 6:39 ` Takashi Iwai 2008-10-31 20:49 ` Troy Kisky 1 sibling, 0 replies; 7+ messages in thread From: Takashi Iwai @ 2008-10-31 6:39 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, Troy Kisky At Fri, 31 Oct 2008 14:41:06 +1100, Stephen Rothwell wrote: > > Hi Takashi, > > Today's linux-next build (x86_64 allmodconfig) failed like this: > > sound/soc/soc-dapm.c: In function 'snd_soc_dapm_sys_add': > sound/soc/soc-dapm.c:828: error: 'ret' undeclared (first use in this function) > > Caused by commit 12ef193d5817504621e503e78d641265f6a86ac4 ("ASoC: Allow > setting codec register with debugfs filesystem") which removed the > declaration. > > I applied the following patch. More care required. Thanks. Applied now. I wonder why I didn't this in my build test... Takashi > -- > Cheers, > Stephen Rothwell sfr@canb•auug.org.au > http://www.canb.auug.org.au/~sfr/ > > From: Stephen Rothwell <sfr@canb•auug.org.au> > Date: Fri, 31 Oct 2008 14:39:03 +1100 > Subject: [PATCH] ALSA: restore removeed variable declaration > > Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au> > --- > sound/soc/soc-dapm.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c > index 407092c..7bf3c40 100644 > --- a/sound/soc/soc-dapm.c > +++ b/sound/soc/soc-dapm.c > @@ -822,6 +822,8 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); > > int snd_soc_dapm_sys_add(struct device *dev) > { > + int ret; > + > if (!dapm_status) > return 0; > > -- > 1.5.6.5 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: sound tree build failure 2008-10-31 3:41 linux-next: sound tree build failure Stephen Rothwell 2008-10-31 6:39 ` Takashi Iwai @ 2008-10-31 20:49 ` Troy Kisky 2008-11-01 9:53 ` Takashi Iwai 1 sibling, 1 reply; 7+ messages in thread From: Troy Kisky @ 2008-10-31 20:49 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Takashi Iwai, linux-next Stephen Rothwell wrote: > Hi Takashi, > > Today's linux-next build (x86_64 allmodconfig) failed like this: > > sound/soc/soc-dapm.c: In function 'snd_soc_dapm_sys_add': > sound/soc/soc-dapm.c:828: error: 'ret' undeclared (first use in this function) > > Caused by commit 12ef193d5817504621e503e78d641265f6a86ac4 ("ASoC: Allow > setting codec register with debugfs filesystem") which removed the > declaration. > > I applied the following patch. More care required. My patch had @@ -822,23 +818,9 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); int snd_soc_dapm_sys_add(struct device *dev) { - int ret = 0; - if (!dapm_status) return 0; - - ret = device_create_file(dev, &dev_attr_dapm_widget); - if (ret != 0) - return ret; - - asoc_debugfs = debugfs_create_dir("asoc", NULL); - if (!IS_ERR(asoc_debugfs)) - debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, - &pop_time); - else - asoc_debugfs = NULL; - - return 0; + return device_create_file(dev, &dev_attr_dapm_widget); } which somehow got changed to @@ -821,23 +817,13 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); int snd_soc_dapm_sys_add(struct device *dev) { - int ret = 0; - if (!dapm_status) return 0; ret = device_create_file(dev, &dev_attr_dapm_widget); if (ret != 0) return ret; - - asoc_debugfs = debugfs_create_dir("asoc", NULL); - if (!IS_ERR(asoc_debugfs) && asoc_debugfs) - debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, - &pop_time); - else - asoc_debugfs = NULL; - - return 0; + return device_create_file(dev, &dev_attr_dapm_widget); } which will call device_create_file twice Troy ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: sound tree build failure 2008-10-31 20:49 ` Troy Kisky @ 2008-11-01 9:53 ` Takashi Iwai 2008-11-03 19:22 ` [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error Troy Kisky 0 siblings, 1 reply; 7+ messages in thread From: Takashi Iwai @ 2008-11-01 9:53 UTC (permalink / raw) To: Troy Kisky; +Cc: Stephen Rothwell, linux-next At Fri, 31 Oct 2008 13:49:44 -0700, Troy Kisky wrote: > > Stephen Rothwell wrote: > > Hi Takashi, > > > > Today's linux-next build (x86_64 allmodconfig) failed like this: > > > > sound/soc/soc-dapm.c: In function 'snd_soc_dapm_sys_add': > > sound/soc/soc-dapm.c:828: error: 'ret' undeclared (first use in this function) > > > > Caused by commit 12ef193d5817504621e503e78d641265f6a86ac4 ("ASoC: Allow > > setting codec register with debugfs filesystem") which removed the > > declaration. > > > > I applied the following patch. More care required. > > My patch had > @@ -822,23 +818,9 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); > > int snd_soc_dapm_sys_add(struct device *dev) > { > - int ret = 0; > - > if (!dapm_status) > return 0; > - > - ret = device_create_file(dev, &dev_attr_dapm_widget); > - if (ret != 0) > - return ret; > - > - asoc_debugfs = debugfs_create_dir("asoc", NULL); > - if (!IS_ERR(asoc_debugfs)) > - debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, > - &pop_time); > - else > - asoc_debugfs = NULL; > - > - return 0; > + return device_create_file(dev, &dev_attr_dapm_widget); > } > > > > which somehow got changed to > @@ -821,23 +817,13 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); > > int snd_soc_dapm_sys_add(struct device *dev) > { > - int ret = 0; > - > if (!dapm_status) > return 0; > > ret = device_create_file(dev, &dev_attr_dapm_widget); > if (ret != 0) > return ret; > - > - asoc_debugfs = debugfs_create_dir("asoc", NULL); > - if (!IS_ERR(asoc_debugfs) && asoc_debugfs) > - debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, > - &pop_time); > - else > - asoc_debugfs = NULL; > - > - return 0; > + return device_create_file(dev, &dev_attr_dapm_widget); > } > > > which will call device_create_file twice Hm, looks like a merge error or so. Care to create the fix patch against the latest tree? thanks, Takashi ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error 2008-11-01 9:53 ` Takashi Iwai @ 2008-11-03 19:22 ` Troy Kisky 2008-11-03 19:58 ` Mark Brown 2008-11-04 7:46 ` Takashi Iwai 0 siblings, 2 replies; 7+ messages in thread From: Troy Kisky @ 2008-11-03 19:22 UTC (permalink / raw) To: tiwai; +Cc: broonie, linux-next, Troy Kisky Call device_create_file only once in snd_soc_dapm_sys_add function. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices•com> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7bf3c40..0fecbb4 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -822,14 +822,8 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); int snd_soc_dapm_sys_add(struct device *dev) { - int ret; - if (!dapm_status) return 0; - - ret = device_create_file(dev, &dev_attr_dapm_widget); - if (ret != 0) - return ret; return device_create_file(dev, &dev_attr_dapm_widget); } -- 1.5.4.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error 2008-11-03 19:22 ` [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error Troy Kisky @ 2008-11-03 19:58 ` Mark Brown 2008-11-04 7:46 ` Takashi Iwai 1 sibling, 0 replies; 7+ messages in thread From: Mark Brown @ 2008-11-03 19:58 UTC (permalink / raw) Cc: tiwai@suse•de, linux-next@vger•kernel.org, Troy Kisky On 3 Nov 2008, at 19:22, Troy Kisky <troy.kisky@boundarydevices•com> wrote: > Call device_create_file only once in snd_soc_dapm_sys_add function. > > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices•com> Acked-by: Mark Brown <broonie@opensource•wolfsonmicro.com> > > > diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c > index 7bf3c40..0fecbb4 100644 > --- a/sound/soc/soc-dapm.c > +++ b/sound/soc/soc-dapm.c > @@ -822,14 +822,8 @@ static DEVICE_ATTR(dapm_widget, 0444, > dapm_widget_show, NULL); > > int snd_soc_dapm_sys_add(struct device *dev) > { > - int ret; > - > if (!dapm_status) > return 0; > - > - ret = device_create_file(dev, &dev_attr_dapm_widget); > - if (ret != 0) > - return ret; > return device_create_file(dev, &dev_attr_dapm_widget); > } > > -- > 1.5.4.3 > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error 2008-11-03 19:22 ` [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error Troy Kisky 2008-11-03 19:58 ` Mark Brown @ 2008-11-04 7:46 ` Takashi Iwai 1 sibling, 0 replies; 7+ messages in thread From: Takashi Iwai @ 2008-11-04 7:46 UTC (permalink / raw) To: Troy Kisky; +Cc: broonie, linux-next At Mon, 3 Nov 2008 12:22:07 -0700, Troy Kisky wrote: > > Call device_create_file only once in snd_soc_dapm_sys_add function. > > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices•com> Applied now. Thanks. Takashi > > diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c > index 7bf3c40..0fecbb4 100644 > --- a/sound/soc/soc-dapm.c > +++ b/sound/soc/soc-dapm.c > @@ -822,14 +822,8 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); > > int snd_soc_dapm_sys_add(struct device *dev) > { > - int ret; > - > if (!dapm_status) > return 0; > - > - ret = device_create_file(dev, &dev_attr_dapm_widget); > - if (ret != 0) > - return ret; > return device_create_file(dev, &dev_attr_dapm_widget); > } > > -- > 1.5.4.3 > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-11-04 7:46 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-10-31 3:41 linux-next: sound tree build failure Stephen Rothwell 2008-10-31 6:39 ` Takashi Iwai 2008-10-31 20:49 ` Troy Kisky 2008-11-01 9:53 ` Takashi Iwai 2008-11-03 19:22 ` [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error Troy Kisky 2008-11-03 19:58 ` Mark Brown 2008-11-04 7:46 ` Takashi Iwai
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox