* [PATCH] sound: sh: Fix up namespace collision in sh_dac_audio.
@ 2012-05-21 9:21 Paul Mundt
2012-05-21 9:38 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Paul Mundt @ 2012-05-21 9:21 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Axel Lin, alsa-devel
The module_platform_driver() conversion ended up tripping over the driver
name, leading to confusion in the macro with regards to 'driver' being
redefined. rename it to something slightly more suitable to avoid
namespace collisions.
sound/sh/sh_dac_audio.c:444:122: error: conflicting types for 'driver_init'
include/linux/device.h:773:6: note: previous declaration of 'driver_init' was here
make[3]: *** [sound/sh/sh_dac_audio.o] Error 1
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
sound/sh/sh_dac_audio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c
index b11f82b..f8b01c7 100644
--- a/sound/sh/sh_dac_audio.c
+++ b/sound/sh/sh_dac_audio.c
@@ -433,7 +433,7 @@ probe_error:
/*
* "driver" definition
*/
-static struct platform_driver driver = {
+static struct platform_driver sh_dac_driver = {
.probe = snd_sh_dac_probe,
.remove = snd_sh_dac_remove,
.driver = {
@@ -441,4 +441,4 @@ static struct platform_driver driver = {
},
};
-module_platform_driver(driver);
+module_platform_driver(sh_dac_driver);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sound: sh: Fix up namespace collision in sh_dac_audio.
2012-05-21 9:21 [PATCH] sound: sh: Fix up namespace collision in sh_dac_audio Paul Mundt
@ 2012-05-21 9:38 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2012-05-21 9:38 UTC (permalink / raw)
To: Paul Mundt; +Cc: Axel Lin, alsa-devel
At Mon, 21 May 2012 18:21:54 +0900,
Paul Mundt wrote:
>
> The module_platform_driver() conversion ended up tripping over the driver
> name, leading to confusion in the macro with regards to 'driver' being
> redefined. rename it to something slightly more suitable to avoid
> namespace collisions.
>
> sound/sh/sh_dac_audio.c:444:122: error: conflicting types for 'driver_init'
> include/linux/device.h:773:6: note: previous declaration of 'driver_init' was here
> make[3]: *** [sound/sh/sh_dac_audio.o] Error 1
>
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Thanks, applied now.
Takashi
>
> ---
>
> sound/sh/sh_dac_audio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c
> index b11f82b..f8b01c7 100644
> --- a/sound/sh/sh_dac_audio.c
> +++ b/sound/sh/sh_dac_audio.c
> @@ -433,7 +433,7 @@ probe_error:
> /*
> * "driver" definition
> */
> -static struct platform_driver driver = {
> +static struct platform_driver sh_dac_driver = {
> .probe = snd_sh_dac_probe,
> .remove = snd_sh_dac_remove,
> .driver = {
> @@ -441,4 +441,4 @@ static struct platform_driver driver = {
> },
> };
>
> -module_platform_driver(driver);
> +module_platform_driver(sh_dac_driver);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-21 9:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-21 9:21 [PATCH] sound: sh: Fix up namespace collision in sh_dac_audio Paul Mundt
2012-05-21 9:38 ` 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.