* [PATCH] ASoC: rcar: remove unused variable
@ 2015-11-23 9:35 Arnd Bergmann
2015-11-25 6:25 ` Kuninori Morimoto
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2015-11-23 9:35 UTC (permalink / raw)
To: linux-arm-kernel
After a recent cleanup, the soc_card variable became unused
and now produces a warning:
soc/sh/rcar/core.c: In function '__rsnd_kctrl_new':
soc/sh/rcar/core.c:801:23: warning: unused variable 'soc_card' [-Wunused-variable]
This removes the variable.
Fixes: 1a497983a5ae ("ASoC: Change the PCM runtime array to a list")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index c6685f14b9cb..90b244c1f526 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -798,7 +798,6 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
void (*update)(struct rsnd_dai_stream *io,
struct rsnd_mod *mod))
{
- struct snd_soc_card *soc_card = rtd->card;
struct snd_card *card = rtd->card->snd_card;
struct snd_kcontrol *kctrl;
struct snd_kcontrol_new knew = {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ASoC: rcar: remove unused variable
2015-11-23 9:35 [PATCH] ASoC: rcar: remove unused variable Arnd Bergmann
@ 2015-11-25 6:25 ` Kuninori Morimoto
2015-11-25 8:36 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Kuninori Morimoto @ 2015-11-25 6:25 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Mark
> After a recent cleanup, the soc_card variable became unused
> and now produces a warning:
>
> soc/sh/rcar/core.c: In function '__rsnd_kctrl_new':
> soc/sh/rcar/core.c:801:23: warning: unused variable 'soc_card' [-Wunused-variable]
>
> This removes the variable.
>
> Fixes: 1a497983a5ae ("ASoC: Change the PCM runtime array to a list")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
> index c6685f14b9cb..90b244c1f526 100644
> --- a/sound/soc/sh/rcar/core.c
> +++ b/sound/soc/sh/rcar/core.c
> @@ -798,7 +798,6 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
> void (*update)(struct rsnd_dai_stream *io,
> struct rsnd_mod *mod))
> {
> - struct snd_soc_card *soc_card = rtd->card;
> struct snd_card *card = rtd->card->snd_card;
> struct snd_kcontrol *kctrl;
> struct snd_kcontrol_new knew = {
It seems this patch was accepted to topic/rcar branch,
but I got compile error
/opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c: In function '__rsnd_kctrl_new':
/opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c:807:18: error: 'soc_card' undeclared (first use in this function)
.index = rtd - soc_card->rtd,
^
/opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c:807:18: note: each undeclared identifier is reported only once for each function it appears in
make[6]: *** [sound/soc/sh/rcar/core.o] ??? 1
make[6]: *** ??????????????....
make[5]: *** [sound/soc/sh/rcar] ??? 2
make[4]: *** [sound/soc/sh] ??? 2
This __rsnd_kctrl_new() is using "soc_card"...
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] ASoC: rcar: remove unused variable
2015-11-25 6:25 ` Kuninori Morimoto
@ 2015-11-25 8:36 ` Arnd Bergmann
2015-11-25 23:54 ` Kuninori Morimoto
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2015-11-25 8:36 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 25 November 2015 06:25:36 Kuninori Morimoto wrote:
>
> Hi Arnd, Mark
>
> > After a recent cleanup, the soc_card variable became unused
> > and now produces a warning:
> >
> > soc/sh/rcar/core.c: In function '__rsnd_kctrl_new':
> > soc/sh/rcar/core.c:801:23: warning: unused variable 'soc_card' [-Wunused-variable]
> >
> > This removes the variable.
> >
> > Fixes: 1a497983a5ae ("ASoC: Change the PCM runtime array to a list")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >
> > diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
> > index c6685f14b9cb..90b244c1f526 100644
> > --- a/sound/soc/sh/rcar/core.c
> > +++ b/sound/soc/sh/rcar/core.c
> > @@ -798,7 +798,6 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
> > void (*update)(struct rsnd_dai_stream *io,
> > struct rsnd_mod *mod))
> > {
> > - struct snd_soc_card *soc_card = rtd->card;
> > struct snd_card *card = rtd->card->snd_card;
> > struct snd_kcontrol *kctrl;
> > struct snd_kcontrol_new knew = {
>
> It seems this patch was accepted to topic/rcar branch,
> but I got compile error
>
> /opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c: In function '__rsnd_kctrl_new':
> /opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c:807:18: error: 'soc_card' undeclared (first use in this function)
> .index = rtd - soc_card->rtd,
> ^
> /opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c:807:18: note: each undeclared identifier is reported only once for each function it appears in
> make[6]: *** [sound/soc/sh/rcar/core.o] ??? 1
> make[6]: *** ??????????????....
> make[5]: *** [sound/soc/sh/rcar] ??? 2
> make[4]: *** [sound/soc/sh] ??? 2
>
> This __rsnd_kctrl_new() is using "soc_card"...
It looks like the commit that removed the user of that variable is in the
"topic/pcm-list" branch instead of "topic/rcar".
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] ASoC: rcar: remove unused variable
2015-11-25 8:36 ` Arnd Bergmann
@ 2015-11-25 23:54 ` Kuninori Morimoto
2015-11-26 1:05 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Kuninori Morimoto @ 2015-11-25 23:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mark, Arnd
> > /opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c: In function '__rsnd_kctrl_new':
> > /opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c:807:18: error: 'soc_card' undeclared (first use in this function)
> > .index = rtd - soc_card->rtd,
> > ^
> > /opt/home/morimoto/WORK/linux/sound/soc/sh/rcar/core.c:807:18: note: each undeclared identifier is reported only once for each function it appears in
> > make[6]: *** [sound/soc/sh/rcar/core.o] ??? 1
> > make[6]: *** ??????????????....
> > make[5]: *** [sound/soc/sh/rcar] ??? 2
> > make[4]: *** [sound/soc/sh] ??? 2
> >
> > This __rsnd_kctrl_new() is using "soc_card"...
>
> It looks like the commit that removed the user of that variable is in the
> "topic/pcm-list" branch instead of "topic/rcar".
Mark
It is possible to remove this patch from topic/rcar,
and, apply it to topic/pcm-list ?
ccae40fa973f5b0eec5d5ad27e81c5a2b95f7b7c
(" ASoC: rcar: remove unused variable")
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-26 2:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-23 9:35 [PATCH] ASoC: rcar: remove unused variable Arnd Bergmann
2015-11-25 6:25 ` Kuninori Morimoto
2015-11-25 8:36 ` Arnd Bergmann
2015-11-25 23:54 ` Kuninori Morimoto
2015-11-26 1:05 ` Mark Brown
2015-11-26 2:17 ` Kuninori Morimoto
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).