Skip to contentSkip to conversation

mtd: adding __init/__exit macros to init/exitfunctions of mtd drivers

PATCH Applied Peter Hüwe 3 participants 5 messages Jun 11, 2009 – Jul 1, 2009

Subsystems (3)
Kernel janitors Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Peter Hüwe

author
#0 lore raw

PATCH 1/1 mtd: adding __init/__exit macros to init/exitfunctions of mtd drivers

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init and __exit macros to the module_init / module_exit functions to the following modules from drivers/mtd/
devices/m25p80.c
devices/slram.c
linux version 2.6.30
ftl.c
nand/cafe_nand.c
nand/cmx270_nand.c

Signed-off-by Peter Huewe <[email protected]>

---

drivers/mtd/devices/m25p80.c +2 -2
index cc6369e..4ca4fab 100644
@@ -772,13 +772,13 @@ static struct spi_driver m25p80_driver = {
 };
 
 
-static int m25p80_init(void)
+static int __init m25p80_init(void)
 {
 	return spi_register_driver(&m25p80_driver);
 }
 
 
-static void m25p80_exit(void)
+static void __exit m25p80_exit(void)
 {
 	spi_unregister_driver(&m25p80_driver);
 }
drivers/mtd/devices/slram.c +1 -1
index 00248e8..7d846e9 100644
@@ -303,7 +303,7 @@ __setup("slram=", mtd_slram_setup);
 
 #endif
 
-static int init_slram(void)
+static int __init init_slram(void)
 {
 	char *devname;
 	int i;
drivers/mtd/ftl.c +1 -1
index a790c06..e56d6b4 100644
@@ -1099,7 +1099,7 @@ static struct mtd_blktrans_ops ftl_tr = {
 	.owner		= THIS_MODULE,
 };
 
-static int init_ftl(void)
+static int __init init_ftl(void)
 {
 	return register_mtd_blktrans(&ftl_tr);
 }
drivers/mtd/nand/cafe_nand.c +2 -2
index 29acd06..1b4690b 100644
@@ -903,12 +903,12 @@ static struct pci_driver cafe_nand_pci_driver = {
 	.resume = cafe_nand_resume,
 };
 
-static int cafe_nand_init(void)
+static int __init cafe_nand_init(void)
 {
 	return pci_register_driver(&cafe_nand_pci_driver);
 }
 
-static void cafe_nand_exit(void)
+static void __exit cafe_nand_exit(void)
 {
 	pci_unregister_driver(&cafe_nand_pci_driver);
 }
drivers/mtd/nand/cmx270_nand.c +2 -2
index 10081e6..826cacf 100644
@@ -147,7 +147,7 @@ static int cmx270_device_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-static int cmx270_init(void)
+static int __init cmx270_init(void)
 {
 	struct nand_chip *this;
 	const char *part_type;

@@ -261,7 +261,7 @@ module_init(cmx270_init);
 /*
  * Clean up routine
  */
-static void cmx270_cleanup(void)
+static void __exit cmx270_cleanup(void)
 {
 	/* Release resources, unregister device */
 	nand_release(cmx270_nand_mtd);
#1 lore raw

Re: [PATCH] mtd: adding __init/__exit macros to init/exitfunctions

[ CCing dmmw2 -- please either Ack the patch so that I can take it through
trivial tree, or take it through your tree. Thanks.

Quoted 101 lines · Peter Hüwe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init and __exit macros to the module_init / module_exit functions to the following modules from drivers/mtd/
devices/m25p80.c
devices/slram.c
linux version 2.6.30
ftl.c
nand/cafe_nand.c
nand/cmx270_nand.c

Signed-off-by Peter Huewe <[email protected]>

---

drivers/mtd/devices/m25p80.c +2 -2
index cc6369e..4ca4fab 100644
@@ -772,13 +772,13 @@ static struct spi_driver m25p80_driver = {
 };
 
 
-static int m25p80_init(void)
+static int __init m25p80_init(void)
 {
 	return spi_register_driver(&m25p80_driver);
 }
 
 
-static void m25p80_exit(void)
+static void __exit m25p80_exit(void)
 {
 	spi_unregister_driver(&m25p80_driver);
 }
drivers/mtd/devices/slram.c +1 -1
index 00248e8..7d846e9 100644
@@ -303,7 +303,7 @@ __setup("slram=", mtd_slram_setup);
 
 #endif
 
-static int init_slram(void)
+static int __init init_slram(void)
 {
 	char *devname;
 	int i;
drivers/mtd/ftl.c +1 -1
index a790c06..e56d6b4 100644
@@ -1099,7 +1099,7 @@ static struct mtd_blktrans_ops ftl_tr = {
 	.owner		= THIS_MODULE,
 };
 
-static int init_ftl(void)
+static int __init init_ftl(void)
 {
 	return register_mtd_blktrans(&ftl_tr);
 }
drivers/mtd/nand/cafe_nand.c +2 -2
index 29acd06..1b4690b 100644
@@ -903,12 +903,12 @@ static struct pci_driver cafe_nand_pci_driver = {
 	.resume = cafe_nand_resume,
 };
 
-static int cafe_nand_init(void)
+static int __init cafe_nand_init(void)
 {
 	return pci_register_driver(&cafe_nand_pci_driver);
 }
 
-static void cafe_nand_exit(void)
+static void __exit cafe_nand_exit(void)
 {
 	pci_unregister_driver(&cafe_nand_pci_driver);
 }
drivers/mtd/nand/cmx270_nand.c +2 -2
index 10081e6..826cacf 100644
@@ -147,7 +147,7 @@ static int cmx270_device_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-static int cmx270_init(void)
+static int __init cmx270_init(void)
 {
 	struct nand_chip *this;
 	const char *part_type;

@@ -261,7 +261,7 @@ module_init(cmx270_init);
 /*
  * Clean up routine
  */
-static void cmx270_cleanup(void)
+static void __exit cmx270_cleanup(void)
 {
 	/* Release resources, unregister device */
 	nand_release(cmx270_nand_mtd);
Signature · 2 lines
Jiri Kosina
SUSE Labs
author
#2 lore raw
In reply to Peter Hüwe

Am Freitag 12 Juni 2009 11:03:19 schrieb Jiri Kosina:

Quoted 16 lines

[ CCing dmmw2 -- please either Ack the patch so that I can take it through
trivial tree, or take it through your tree. Thanks.

Quoted 12 lines · Peter Hüwe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init and __exit macros to the module_init / module_exit functions to the following modules from drivers/mtd/ devices/m25p80.c
devices/slram.c
linux version 2.6.30
ftl.c
nand/cafe_nand.c
nand/cmx270_nand.c

Signed-off-by Peter Huewe <[email protected]>

Hi,
@ dwmw2: can you please have a look at the trivial patch and if there is no problem with it ack it so Jiri can take it through the trivial tree or even better you take it through one of yours?
Would be very kind of you.

Thanks,
Peter
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#3 lore raw
In reply to Peter Hüwe

Am Freitag 12 Juni 2009 11:03:19 schrieb Jiri Kosina:

Quoted 2 lines

[ CCing dmmw2 -- please either Ack the patch so that I can take it through
trivial tree, or take it through your tree. Thanks.

Hi Jiri,

any updates on this patch yet? :)
Should I resubmit it with all the addresses from the new get_maintainer script?

Thanks,
Peter

Applied
#4 lore raw

Re: [PATCH] mtd: adding __init/__exit macros to init/exitfunctions

In reply to Peter Hüwe
Quoted 4 lines · Peter Hüwe
Quoted 2 lines

[ CCing dmmw2 -- please either Ack the patch so that I can take it through
trivial tree, or take it through your tree. Thanks.

any updates on this patch yet? :) Should I resubmit it with all the addresses from the new get_maintainer script?

I have applied the patch to trivial queue now.

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs