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

login
register
mail settings
Submitter Axel Lin
Date Jan. 27, 2012, 7:45 a.m.
Message ID <1327650320.3758.5.camel@phoenix>
Download mbox | patch
Permalink /patch/138192/
State New
Headers show

Comments

Axel Lin - Jan. 27, 2012, 7:45 a.m.
This patch converts the drivers in drivers/mtd/* to use the
module_spi_driver() macro which makes the code smaller and a bit simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Mike Lavender <mike@steroidmicros.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Andre Renaud <andre@bluewatersys.com>
Cc: Ryan Mallon <rmallon@gmail.com>
---
 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(-)
Ryan Mallon - Jan. 27, 2012, 8:23 a.m.
On 27/01/12 18:45, Axel Lin wrote:
> This patch converts the drivers in drivers/mtd/* to use the
> module_spi_driver() macro which makes the code smaller and a bit simpler.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Cc: Mike Lavender <mike@steroidmicros.com>
> Cc: Andrew Victor <linux@maxim.org.za>
> Cc: Andre Renaud <andre@bluewatersys.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
> ---
>  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:

Acked-by: Ryan Mallon <rmallon@gmail.com>

> diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
> index 7c60ddd..230b02e 100644
> --- a/drivers/mtd/devices/m25p80.c
> +++ b/drivers/mtd/devices/m25p80.c
> @@ -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");
> diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
> index 236057e..5ec5fc9 100644
> --- a/drivers/mtd/devices/mtd_dataflash.c
> +++ b/drivers/mtd/devices/mtd_dataflash.c
> @@ -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");
> diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
> index 5fc1983..196fd95 100644
> --- a/drivers/mtd/devices/sst25l.c
> +++ b/drivers/mtd/devices/sst25l.c
> @@ -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 <andre@bluewatersys.com>, "
Artem Bityutskiy - Jan. 27, 2012, 3:03 p.m.
On Fri, 2012-01-27 at 15:45 +0800, Axel Lin wrote:
> 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!

Patch

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7c60ddd..230b02e 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -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");
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 236057e..5ec5fc9 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -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");
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 5fc1983..196fd95 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -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 <andre@bluewatersys.com>, "