Skip to contentSkip to conversation

mtd: convert drivers/mtd/* to use module_spi_driver()

PATCH Applied Axel Lin 3 participants 3 messages Jan 27, 2012 Memory technology devices (MTD)

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 mtd: convert drivers/mtd/* to use module_spi_driver()

This patch converts the drivers in drivers/mtd/* to use the module_spi_driver() macro which makes the code smaller and a bit simpler.

Cc Mike Lavender <[email protected]>
Cc Andrew Victor <[email protected]>
Cc Andre Renaud <[email protected]>
Cc Ryan Mallon <[email protected]>
---
 drivers/mtd/devices/m25p80.c        |   16 +---------------
 drivers/mtd/devices/mtd_dataflash.c |   13 +------------
 drivers/mtd/devices/sst25l.c        |   13 +------------
 3 files changed, 3 insertions(+), 39 deletions(-)
drivers/mtd/devices/m25p80.c +1 -15
index 7c60ddd..230b02e 100644
@@ -1004,21 +1004,7 @@ static struct spi_driver m25p80_driver = {
 	 */
 };
 
-
-static int __init m25p80_init(void)
-{
-	return spi_register_driver(&m25p80_driver);
-}
-
-
-static void __exit m25p80_exit(void)
-{
-	spi_unregister_driver(&m25p80_driver);
-}
-
-
-module_init(m25p80_init);
-module_exit(m25p80_exit);
+module_spi_driver(m25p80_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mike Lavender");
drivers/mtd/devices/mtd_dataflash.c +1 -12
index 236057e..5ec5fc9 100644
@@ -946,18 +946,7 @@ static struct spi_driver dataflash_driver = {
 	/* FIXME:  investigate suspend and resume... */
 };
 
-static int __init dataflash_init(void)
-{
-	return spi_register_driver(&dataflash_driver);
-}
-module_init(dataflash_init);
-
-static void __exit dataflash_exit(void)
-{
-	spi_unregister_driver(&dataflash_driver);
-}
-module_exit(dataflash_exit);
-
+module_spi_driver(dataflash_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Andrew Victor, David Brownell");
drivers/mtd/devices/sst25l.c +1 -12
index 5fc1983..196fd95 100644
@@ -450,18 +450,7 @@ static struct spi_driver sst25l_driver = {
 	.remove		= __devexit_p(sst25l_remove),
 };
 
-static int __init sst25l_init(void)
-{
-	return spi_register_driver(&sst25l_driver);
-}
-
-static void __exit sst25l_exit(void)
-{
-	spi_unregister_driver(&sst25l_driver);
-}
-
-module_init(sst25l_init);
-module_exit(sst25l_exit);
+module_spi_driver(sst25l_driver);
 
 MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips");
 MODULE_AUTHOR("Andre Renaud <[email protected]>, "
Signature · 1 line
1.7.5.4
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Axel Lin

This patch converts the drivers in drivers/mtd/* to use the module_spi_driver() macro which makes the code smaller and a bit simpler.

Cc Mike Lavender <[email protected]>
Cc Andrew Victor <[email protected]>
Cc Andre Renaud <[email protected]>
Cc Ryan Mallon <[email protected]>
Quoted 5 lines
---
 drivers/mtd/devices/m25p80.c        |   16 +---------------
 drivers/mtd/devices/mtd_dataflash.c |   13 +------------
 drivers/mtd/devices/sst25l.c        |   13 +------------
 3 files changed, 3 insertions(+), 39 deletions(-)

For sst25l:

Quoted 75 lines
drivers/mtd/devices/m25p80.c +1 -15
index 7c60ddd..230b02e 100644
@@ -1004,21 +1004,7 @@ static struct spi_driver m25p80_driver = {
 	 */
 };
 
-
-static int __init m25p80_init(void)
-{
-	return spi_register_driver(&m25p80_driver);
-}
-
-
-static void __exit m25p80_exit(void)
-{
-	spi_unregister_driver(&m25p80_driver);
-}
-
-
-module_init(m25p80_init);
-module_exit(m25p80_exit);
+module_spi_driver(m25p80_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mike Lavender");
drivers/mtd/devices/mtd_dataflash.c +1 -12
index 236057e..5ec5fc9 100644
@@ -946,18 +946,7 @@ static struct spi_driver dataflash_driver = {
 	/* FIXME:  investigate suspend and resume... */
 };
 
-static int __init dataflash_init(void)
-{
-	return spi_register_driver(&dataflash_driver);
-}
-module_init(dataflash_init);
-
-static void __exit dataflash_exit(void)
-{
-	spi_unregister_driver(&dataflash_driver);
-}
-module_exit(dataflash_exit);
-
+module_spi_driver(dataflash_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Andrew Victor, David Brownell");
drivers/mtd/devices/sst25l.c +1 -12
index 5fc1983..196fd95 100644
@@ -450,18 +450,7 @@ static struct spi_driver sst25l_driver = {
 	.remove		= __devexit_p(sst25l_remove),
 };
 
-static int __init sst25l_init(void)
-{
-	return spi_register_driver(&sst25l_driver);
-}
-
-static void __exit sst25l_exit(void)
-{
-	spi_unregister_driver(&sst25l_driver);
-}
-
-module_init(sst25l_init);
-module_exit(sst25l_exit);
+module_spi_driver(sst25l_driver);
 
 MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips");
 MODULE_AUTHOR("Andre Renaud <[email protected]>, "
#2 lore raw
In reply to Axel Lin
Quoted 2 lines · Axel Lin

This patch converts the drivers in drivers/mtd/* to use the module_spi_driver() macro which makes the code smaller and a bit simpler.

Pushed to l2-mtd.git, thanks!

Signature · 2 lines
Best Regards,
Artem Bityutskiy