* [PATCH] sound: oss: fix build warning
@ 2015-05-14 11:12 Sudip Mukherjee
2015-05-18 8:29 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Sudip Mukherjee @ 2015-05-14 11:12 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai; +Cc: alsa-devel, linux-kernel, Sudip Mukherjee
while building with allyesconfig it was giving a build warning about
unused variable. declare the variable only if the driver is built as a
module.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
build tested with allyesconfig and allmodconfig
sound/oss/ad1848.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index ec1ee07..10c8de1 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -2860,6 +2860,7 @@ static struct {
{NULL}
};
+#ifdef MODULE
static struct isapnp_device_id id_table[] = {
{ ISAPNP_VENDOR('C','M','I'), ISAPNP_DEVICE(0x0001),
ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001), 0 },
@@ -2877,6 +2878,7 @@ static struct isapnp_device_id id_table[] = {
};
MODULE_DEVICE_TABLE(isapnp, id_table);
+#endif
static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev *dev)
{
--
1.8.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sound: oss: fix build warning
2015-05-14 11:12 [PATCH] sound: oss: fix build warning Sudip Mukherjee
@ 2015-05-18 8:29 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2015-05-18 8:29 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: Jaroslav Kysela, alsa-devel, linux-kernel
At Thu, 14 May 2015 16:42:59 +0530,
Sudip Mukherjee wrote:
>
> while building with allyesconfig it was giving a build warning about
> unused variable. declare the variable only if the driver is built as a
> module.
>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Ideally it'd be better to convert to use isapnp_device_id table
directly, but this code is a bit tricky (YMH0021 isn't exposed as a
probe id), so I applied your patch as is.
thanks,
Takashi
> ---
>
> build tested with allyesconfig and allmodconfig
>
> sound/oss/ad1848.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
> index ec1ee07..10c8de1 100644
> --- a/sound/oss/ad1848.c
> +++ b/sound/oss/ad1848.c
> @@ -2860,6 +2860,7 @@ static struct {
> {NULL}
> };
>
> +#ifdef MODULE
> static struct isapnp_device_id id_table[] = {
> { ISAPNP_VENDOR('C','M','I'), ISAPNP_DEVICE(0x0001),
> ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001), 0 },
> @@ -2877,6 +2878,7 @@ static struct isapnp_device_id id_table[] = {
> };
>
> MODULE_DEVICE_TABLE(isapnp, id_table);
> +#endif
>
> static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev *dev)
> {
> --
> 1.8.1.2
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-18 8:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-14 11:12 [PATCH] sound: oss: fix build warning Sudip Mukherjee
2015-05-18 8:29 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.