* [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit
@ 2008-03-04 23:19 akpm
2008-03-08 0:00 ` Kok, Auke
0 siblings, 1 reply; 6+ messages in thread
From: akpm @ 2008-03-04 23:19 UTC (permalink / raw)
To: jeff; +Cc: netdev, akpm, jkschind, alan
From: Jon Schindler <jkschind@gmail.com>
Replace init_module and cleanup_module with static functions and
module_init/module_exit.
Signed-off-by: Jon Schindler <jkschind@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/net/8390.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/net/8390.c~drivers-net-8390c-replace-init_modulecleanup_module-with-module_initmodule_exit drivers/net/8390.c
--- a/drivers/net/8390.c~drivers-net-8390c-replace-init_modulecleanup_module-with-module_initmodule_exit
+++ a/drivers/net/8390.c
@@ -48,14 +48,16 @@ EXPORT_SYMBOL(__alloc_ei_netdev);
#if defined(MODULE)
-int init_module(void)
+static int __init ns8390_module_init(void)
{
return 0;
}
-void cleanup_module(void)
+static void __exit ns8390_module_exit(void)
{
}
+module_init(ns8390_module_init);
+module_exit(ns8390_module_exit);
#endif /* MODULE */
MODULE_LICENSE("GPL");
_
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit
2008-03-04 23:19 [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit akpm
@ 2008-03-08 0:00 ` Kok, Auke
2008-03-09 6:56 ` Jon Schindler
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kok, Auke @ 2008-03-08 0:00 UTC (permalink / raw)
To: jeff; +Cc: akpm, netdev, jkschind, alan
akpm@linux-foundation.org wrote:
> From: Jon Schindler <jkschind@gmail.com>
>
> Replace init_module and cleanup_module with static functions and
> module_init/module_exit.
>
> Signed-off-by: Jon Schindler <jkschind@gmail.com>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
something went wrong here as this patch already appears to be in jeff's upstream
tree as commit 8724c2de65fe527f5b7aa662fcb8573fb8cd02f2, but breaks compile.
with CONFIG_NE2K_PCI=m:
CC [M] drivers/net/8390.o
drivers/net/8390.c: In function '__inittest':
drivers/net/8390.c:60: error: 'ns8390_init_module' undeclared (first use in this
function)
drivers/net/8390.c:60: error: (Each undeclared identifier is reported only once
drivers/net/8390.c:60: error: for each function it appears in.)
make[2]: *** [drivers/net/8390.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
reverting the patch fixes the issue, but better would be to fix.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Jon Schindler <jkschind@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 0ed41a3..a499e86 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -57,7 +57,7 @@ static void __exit ns8390_module_exit(void)
{
}
-module_init(ns8390_init_module);
+module_init(ns8390_module_init);
module_exit(ns8390_module_exit);
#endif /* MODULE */
MODULE_LICENSE("GPL");
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit
2008-03-08 0:00 ` Kok, Auke
@ 2008-03-09 6:56 ` Jon Schindler
2008-03-09 7:00 ` Jon Schindler
2008-03-10 18:58 ` Andrew Morton
2 siblings, 0 replies; 6+ messages in thread
From: Jon Schindler @ 2008-03-09 6:56 UTC (permalink / raw)
To: Kok, Auke; +Cc: jeff, akpm, netdev, alan
Hi,
I actually ended up doing a resubmit, but forgot to send it to Jeff.
I'll send it in the next email.
Jon
On Fri, Mar 7, 2008 at 6:00 PM, Kok, Auke <auke-jan.h.kok@intel.com> wrote:
> akpm@linux-foundation.org wrote:
> > From: Jon Schindler <jkschind@gmail.com>
> >
> > Replace init_module and cleanup_module with static functions and
> > module_init/module_exit.
> >
> > Signed-off-by: Jon Schindler <jkschind@gmail.com>
> > Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>
> something went wrong here as this patch already appears to be in jeff's upstream
> tree as commit 8724c2de65fe527f5b7aa662fcb8573fb8cd02f2, but breaks compile.
>
> with CONFIG_NE2K_PCI=m:
>
> CC [M] drivers/net/8390.o
> drivers/net/8390.c: In function '__inittest':
> drivers/net/8390.c:60: error: 'ns8390_init_module' undeclared (first use in this
> function)
> drivers/net/8390.c:60: error: (Each undeclared identifier is reported only once
> drivers/net/8390.c:60: error: for each function it appears in.)
> make[2]: *** [drivers/net/8390.o] Error 1
> make[1]: *** [drivers/net] Error 2
> make: *** [drivers] Error 2
>
>
> reverting the patch fixes the issue, but better would be to fix.
>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Cc: Jon Schindler <jkschind@gmail.com>
>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Cc: Andrew Morton <akpm@linux-foundation.org>
>
> ---
> diff --git a/drivers/net/8390.c b/drivers/net/8390.c
> index 0ed41a3..a499e86 100644
>
> --- a/drivers/net/8390.c
> +++ b/drivers/net/8390.c
> @@ -57,7 +57,7 @@ static void __exit ns8390_module_exit(void)
> {
> }
>
> -module_init(ns8390_init_module);
>
>
> +module_init(ns8390_module_init);
> module_exit(ns8390_module_exit);
> #endif /* MODULE */
> MODULE_LICENSE("GPL");
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit
2008-03-08 0:00 ` Kok, Auke
2008-03-09 6:56 ` Jon Schindler
@ 2008-03-09 7:00 ` Jon Schindler
2008-03-10 18:58 ` Andrew Morton
2 siblings, 0 replies; 6+ messages in thread
From: Jon Schindler @ 2008-03-09 7:00 UTC (permalink / raw)
To: Kok, Auke; +Cc: jeff, akpm, netdev, alan
Replaced init_module and cleanup_module with static functions and module_init/module_exit.
Signed-off-by: Jon Schindler <jkschind@gmail.com>
---
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index a828076..0ed41a3 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -48,14 +48,16 @@ EXPORT_SYMBOL(__alloc_ei_netdev);
#if defined(MODULE)
-int init_module(void)
+static int __init ns8390_module_init(void)
{
return 0;
}
-void cleanup_module(void)
+static void __exit ns8390_module_exit(void)
{
}
+module_init(ns8390_module_init);
+module_exit(ns8390_module_exit);
#endif /* MODULE */
MODULE_LICENSE("GPL");
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit
2008-03-08 0:00 ` Kok, Auke
2008-03-09 6:56 ` Jon Schindler
2008-03-09 7:00 ` Jon Schindler
@ 2008-03-10 18:58 ` Andrew Morton
2008-03-20 18:15 ` Kok, Auke
2 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2008-03-10 18:58 UTC (permalink / raw)
To: Kok, Auke; +Cc: jeff, netdev, jkschind, alan
On Fri, 07 Mar 2008 16:00:10 -0800
"Kok, Auke" <auke-jan.h.kok@intel.com> wrote:
> akpm@linux-foundation.org wrote:
> > From: Jon Schindler <jkschind@gmail.com>
> >
> > Replace init_module and cleanup_module with static functions and
> > module_init/module_exit.
> >
> > Signed-off-by: Jon Schindler <jkschind@gmail.com>
> > Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>
> something went wrong here as this patch already appears to be in jeff's upstream
> tree as commit 8724c2de65fe527f5b7aa662fcb8573fb8cd02f2, but breaks compile.
>
> with CONFIG_NE2K_PCI=m:
>
> CC [M] drivers/net/8390.o
> drivers/net/8390.c: In function '__inittest':
> drivers/net/8390.c:60: error: 'ns8390_init_module' undeclared (first use in this
> function)
> drivers/net/8390.c:60: error: (Each undeclared identifier is reported only once
> drivers/net/8390.c:60: error: for each function it appears in.)
> make[2]: *** [drivers/net/8390.o] Error 1
> make[1]: *** [drivers/net] Error 2
> make: *** [drivers] Error 2
>
>
> reverting the patch fixes the issue, but better would be to fix.
>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Cc: Jon Schindler <jkschind@gmail.com>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Cc: Andrew Morton <akpm@linux-foundation.org>
>
> ---
> diff --git a/drivers/net/8390.c b/drivers/net/8390.c
> index 0ed41a3..a499e86 100644
> --- a/drivers/net/8390.c
> +++ b/drivers/net/8390.c
> @@ -57,7 +57,7 @@ static void __exit ns8390_module_exit(void)
> {
> }
>
> -module_init(ns8390_init_module);
> +module_init(ns8390_module_init);
> module_exit(ns8390_module_exit);
> #endif /* MODULE */
> MODULE_LICENSE("GPL");
OK, thanks, I'll drop it.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit
2008-03-10 18:58 ` Andrew Morton
@ 2008-03-20 18:15 ` Kok, Auke
0 siblings, 0 replies; 6+ messages in thread
From: Kok, Auke @ 2008-03-20 18:15 UTC (permalink / raw)
To: jeff; +Cc: Andrew Morton, netdev, jkschind, alan
Andrew Morton wrote:
> On Fri, 07 Mar 2008 16:00:10 -0800
> "Kok, Auke" <auke-jan.h.kok@intel.com> wrote:
>
>> akpm@linux-foundation.org wrote:
>>> From: Jon Schindler <jkschind@gmail.com>
>>>
>>> Replace init_module and cleanup_module with static functions and
>>> module_init/module_exit.
>>>
>>> Signed-off-by: Jon Schindler <jkschind@gmail.com>
>>> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
>>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>> something went wrong here as this patch already appears to be in jeff's upstream
>> tree as commit 8724c2de65fe527f5b7aa662fcb8573fb8cd02f2, but breaks compile.
>>
>> with CONFIG_NE2K_PCI=m:
>>
>> CC [M] drivers/net/8390.o
>> drivers/net/8390.c: In function '__inittest':
>> drivers/net/8390.c:60: error: 'ns8390_init_module' undeclared (first use in this
>> function)
>> drivers/net/8390.c:60: error: (Each undeclared identifier is reported only once
>> drivers/net/8390.c:60: error: for each function it appears in.)
>> make[2]: *** [drivers/net/8390.o] Error 1
>> make[1]: *** [drivers/net] Error 2
>> make: *** [drivers] Error 2
>>
>>
>> reverting the patch fixes the issue, but better would be to fix.
>>
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
>> Cc: Jon Schindler <jkschind@gmail.com>
>> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
>> Cc: Andrew Morton <akpm@linux-foundation.org>
>>
>> ---
>> diff --git a/drivers/net/8390.c b/drivers/net/8390.c
>> index 0ed41a3..a499e86 100644
>> --- a/drivers/net/8390.c
>> +++ b/drivers/net/8390.c
>> @@ -57,7 +57,7 @@ static void __exit ns8390_module_exit(void)
>> {
>> }
>>
>> -module_init(ns8390_init_module);
>> +module_init(ns8390_module_init);
>> module_exit(ns8390_module_exit);
>> #endif /* MODULE */
>> MODULE_LICENSE("GPL");
>
> OK, thanks, I'll drop it.
Jeff,
this bug is now sitting in your upstream tree breaking my compiles :(
Please either apply my patch above or do what Andrew did.
thanks,
Auke
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-03-20 18:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-04 23:19 [patch 16/17] drivers/net/8390.c: replace init_module&cleanup_module with module_init&module_exit akpm
2008-03-08 0:00 ` Kok, Auke
2008-03-09 6:56 ` Jon Schindler
2008-03-09 7:00 ` Jon Schindler
2008-03-10 18:58 ` Andrew Morton
2008-03-20 18:15 ` Kok, Auke
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).