[PATCH 1/2] misc: add __init/__exit macros to drivers/misc/hwlat_detector.c

[PATCH 1/2] misc: add __init/__exit macros to drivers/misc/hwlat_detector.c

[peterhuewe]

From: Peter Huewe <peterhuewe@gmx.de>

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of

drivers/misc/hwlat_detector.c

Please have a look at the small patch and either pull it through
your tree, or please ack' it so Jiri can pull it through the trivial
tree.

Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
but also present in linus tree.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
 drivers/misc/hwlat_detector.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/hwlat_detector.c b/drivers/misc/hwlat_detector.c
index e02d8e1..fd6fa6f 100644
--- a/drivers/misc/hwlat_detector.c
+++ b/drivers/misc/hwlat_detector.c
@@ -1163,7 +1163,7 @@ static void free_debugfs(void)
 /**
  * detector_init - Standard module initialization code
  */
-static int detector_init(void)
+static int __init detector_init(void)
 {
 	int ret = -ENOMEM;
 
@@ -1192,7 +1192,7 @@ out:
 /**
  * detector_exit - Standard module cleanup code
  */
-static void detector_exit(void)
+static void __exit detector_exit(void)
 {
 	if (enabled) {
 		enabled = 0;
-- 
1.6.4.4

[PATCH 2/2] ide: add __init/__exit macros to drivers/ide/scc_pata.c

[peterhuewe]

From: Peter Huewe <peterhuewe@gmx.de>

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of

drivers/ide/scc_pata.c

Please have a look at the small patch and either pull it through
your tree, or please ack' it so Jiri can pull it through the trivial
tree.

Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
but also present in linus tree.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
 drivers/ide/scc_pata.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 1104bb3..58c9c91 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -872,14 +872,14 @@ static struct pci_driver scc_pci_driver = {
 	.remove = __devexit_p(scc_remove),
 };
 
-static int scc_ide_init(void)
+static int __init scc_ide_init(void)
 {
 	return ide_pci_register_driver(&scc_pci_driver);
 }
 
 module_init(scc_ide_init);
 /* -- No exit code?
-static void scc_ide_exit(void)
+static void __exit scc_ide_exit(void)
 {
 	ide_pci_unregister_driver(&scc_pci_driver);
 }
-- 
1.6.4.4

Re: [PATCH 1/2] misc: add __init/__exit macros to

[@ 2009-12-22 13:02 UTC (permalink / raw)]

Hello,

On Tue, Dec 22, 2009 at 09:29:23AM +0100, peterhuewe@gmx.de wrote:
> From: Peter Huewe <peterhuewe@gmx.de>
> 
> Trivial patch which adds the __init/__exit macros to the module_init/
> module_exit functions of
> 
> drivers/misc/hwlat_detector.c
> 
> Please have a look at the small patch and either pull it through
> your tree, or please ack' it so Jiri can pull it through the trivial
> tree.
> 
> Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
> but also present in linus tree.
> 
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> ---
The commit log contains some things that are maybe interesting in this
mail, but not in git (base tree, plea to look, exact filename).

Apart from Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Best regards
Uwe

-- 
Pengutronix e.K.                              | Uwe Kleine-König            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] misc: add __init/__exit macros to

[Jiri Kosina]

On Tue, 22 Dec 2009, Uwe Kleine-König wrote:

> > Trivial patch which adds the __init/__exit macros to the module_init/
> > module_exit functions of
> > 
> > drivers/misc/hwlat_detector.c
> > 
> > Please have a look at the small patch and either pull it through
> > your tree, or please ack' it so Jiri can pull it through the trivial
> > tree.
> > 
> > Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
> > but also present in linus tree.
> > 
> > Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> > ---
> The commit log contains some things that are maybe interesting in this
> mail, but not in git (base tree, plea to look, exact filename).
> 
> Apart from Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

The changelog claims that this is against current Linus' tree and patches 
drivers/misc/hwlat_detector.c file, but I can't seem to see anything 
similar in current Linus' tree (HEAD on f7b84a6ba7e).

	$ find . -name hwlat_detector.c
	$

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] misc: add __init/__exit macros to

[Jon Masters]

On Tue, 2009-12-22 at 14:02 +0100, Uwe Kleine-König wrote:
> Hello,
> 
> On Tue, Dec 22, 2009 at 09:29:23AM +0100, peterhuewe@gmx.de wrote:
> > From: Peter Huewe <peterhuewe@gmx.de>
> > 
> > Trivial patch which adds the __init/__exit macros to the module_init/
> > module_exit functions of
> > 
> > drivers/misc/hwlat_detector.c
> > 
> > Please have a look at the small patch and either pull it through
> > your tree, or please ack' it so Jiri can pull it through the trivial
> > tree.
> > 
> > Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
> > but also present in linus tree.
> > 
> > Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> > ---
> The commit log contains some things that are maybe interesting in this
> mail, but not in git (base tree, plea to look, exact filename).
> 
> Apart from Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

I'll get to this later. Just spent 2 days (should have been 10 hours
door to door) traveling to the UK in the worst storms for ten years on
*both* sides of the atlantic. Currently rediscovering sleep ;)

Jon.

Re: [PATCH 2/2] ide: add __init/__exit macros to

[Jiri Kosina]

On Tue, 22 Dec 2009, peterhuewe@gmx.de wrote:

> From: Peter Huewe <peterhuewe@gmx.de>
> 
> Trivial patch which adds the __init/__exit macros to the module_init/
> module_exit functions of
> 
> drivers/ide/scc_pata.c
> 
> Please have a look at the small patch and either pull it through
> your tree, or please ack' it so Jiri can pull it through the trivial
> tree.
> 
> Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
> but also present in linus tree.
> 
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> ---
>  drivers/ide/scc_pata.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
> index 1104bb3..58c9c91 100644
> --- a/drivers/ide/scc_pata.c
> +++ b/drivers/ide/scc_pata.c
> @@ -872,14 +872,14 @@ static struct pci_driver scc_pci_driver = {
>  	.remove = __devexit_p(scc_remove),
>  };
>  
> -static int scc_ide_init(void)
> +static int __init scc_ide_init(void)
>  {
>  	return ide_pci_register_driver(&scc_pci_driver);
>  }
>  
>  module_init(scc_ide_init);
>  /* -- No exit code?
> -static void scc_ide_exit(void)
> +static void __exit scc_ide_exit(void)
>  {
>  	ide_pci_unregister_driver(&scc_pci_driver);
>  }

This code is commented out anyway. So we should either nuke it out 
completely if it is not needed, or uncomment and fix.

Bartlomiej, David?

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: [PATCH 2/2] ide: add __init/__exit macros to drivers/ide/scc_pata.c

[Bartlomiej Zolnierkiewicz]

On Tuesday 05 January 2010 11:25:13 am Jiri Kosina wrote:
> On Tue, 22 Dec 2009, peterhuewe@gmx.de wrote:
> 
> > From: Peter Huewe <peterhuewe@gmx.de>
> > 
> > Trivial patch which adds the __init/__exit macros to the module_init/
> > module_exit functions of
> > 
> > drivers/ide/scc_pata.c
> > 
> > Please have a look at the small patch and either pull it through
> > your tree, or please ack' it so Jiri can pull it through the trivial
> > tree.
> > 
> > Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
> > but also present in linus tree.
> > 
> > Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> > ---
> >  drivers/ide/scc_pata.c |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
> > index 1104bb3..58c9c91 100644
> > --- a/drivers/ide/scc_pata.c
> > +++ b/drivers/ide/scc_pata.c
> > @@ -872,14 +872,14 @@ static struct pci_driver scc_pci_driver = {
> >  	.remove = __devexit_p(scc_remove),
> >  };
> >  
> > -static int scc_ide_init(void)
> > +static int __init scc_ide_init(void)
> >  {
> >  	return ide_pci_register_driver(&scc_pci_driver);
> >  }
> >  
> >  module_init(scc_ide_init);
> >  /* -- No exit code?
> > -static void scc_ide_exit(void)
> > +static void __exit scc_ide_exit(void)
> >  {
> >  	ide_pci_unregister_driver(&scc_pci_driver);
> >  }
> 
> This code is commented out anyway. So we should either nuke it out 
> completely if it is not needed, or uncomment and fix.
> 
> Bartlomiej, David?

We can fix it nowadays, though I worry that by fixing it we may be 'creating
competition' for 'officially blessed yet unmaintained' PATA stack... 8-)

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] scc_pata: fix module unloading

scc_pata host driver predated module unloading support for IDE host
drivers so even though it supports PCI hot-unplug and implements
PCI device ->remove method it doesn't allow module removal.  Fix it.

Add missing __init/__exit tags to module_init/module_exit functions
while at it (from Peter Huewe).

Noticed-by: Jiri Kosina <jkosina@suse.cz>
Cc: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/scc_pata.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Index: b/drivers/ide/scc_pata.c
=================================--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -872,20 +872,18 @@ static struct pci_driver scc_pci_driver
 	.remove = __devexit_p(scc_remove),
 };
 
-static int scc_ide_init(void)
+static int __init scc_ide_init(void)
 {
 	return ide_pci_register_driver(&scc_pci_driver);
 }
 
-module_init(scc_ide_init);
-/* -- No exit code?
-static void scc_ide_exit(void)
+static void __exit scc_ide_exit(void)
 {
-	ide_pci_unregister_driver(&scc_pci_driver);
+	pci_unregister_driver(&scc_pci_driver);
 }
-module_exit(scc_ide_exit);
- */
 
+module_init(scc_ide_init);
+module_exit(scc_ide_exit);
 
 MODULE_DESCRIPTION("PCI driver module for Toshiba SCC IDE");
 MODULE_LICENSE("GPL");

Re: [PATCH 2/2] ide: add __init/__exit macros to

[David Miller]

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 5 Jan 2010 19:39:07 +0100

> We can fix it nowadays, though I worry that by fixing it we may be 'creating
> competition' for 'officially blessed yet unmaintained' PATA stack... 8-)

Not being able to unload a module is a bug isn't it?  Bug fixes
are always fine :-)

I'll take a closer look at this then apply it, thanks Bart!

Re: [PATCH 2/2] ide: add __init/__exit macros to drivers/ide/scc_pata.c

[Peter Huewe]

Am Mittwoch 06 Januar 2010 21:28:26 schrieb David Miller:
> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Date: Tue, 5 Jan 2010 19:39:07 +0100
> 
> 
> Not being able to unload a module is a bug isn't it?  Bug fixes
> are always fine :-)
> 
> I'll take a closer look at this then apply it, thanks Bart!

Funny what such trivial patch can reveal :)

Regards,
Peter

Re: [PATCH 2/2] ide: add __init/__exit macros to

[David Miller]

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 5 Jan 2010 19:39:07 +0100

> -	ide_pci_unregister_driver(&scc_pci_driver);
> +	pci_unregister_driver(&scc_pci_driver);

As a side note I can't figure out how this driver can currently even
build without errors before this patch.

ide_pci_unregister_driver() isn't even defined anywhere these days.

Re: [PATCH 2/2] ide: add __init/__exit macros to

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Fri, 08 Jan 2010 00:13:02 -0800 (PST)

> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Date: Tue, 5 Jan 2010 19:39:07 +0100
> 
>> -	ide_pci_unregister_driver(&scc_pci_driver);
>> +	pci_unregister_driver(&scc_pci_driver);
> 
> As a side note I can't figure out how this driver can currently even
> build without errors before this patch.
> 
> ide_pci_unregister_driver() isn't even defined anywhere these days.

Ignore me, I'm an idiot, this code was commented out of course.
:-)