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

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

Cc David Woodhouse <[email protected]>

Cc Jiandong Zheng <[email protected]>

Cc Scott Branden <[email protected]>

Cc Wan ZongShun <[email protected]>

Cc Dmitry Eremin-Solenikov <[email protected]>

Cc Jamie Iles <[email protected]>

Cc Olof Johansson <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Artem Bityutskiy <[email protected]>

Cc Ralf Baechle <[email protected]>

Cc Brian Norris <[email protected]>

Cc Lars-Peter Clausen <[email protected]>

Cc Manuel Lauss <[email protected]>

Cc Vimal Singh <[email protected]>

Cc Andres Salomon <[email protected]>

Cc Sukumar Ghorai <[email protected]>

Signed-off-by Axel Lin <[email protected]>

Quoted 14 lines · Axel Lin

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

Cc David Woodhouse <[email protected]>

Cc Jiandong Zheng <[email protected]>

Cc Scott Branden <[email protected]>

Cc Wan ZongShun <[email protected]>

Cc Dmitry Eremin-Solenikov <[email protected]>

Cc Jamie Iles <[email protected]>

Cc Olof Johansson <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Artem Bityutskiy <[email protected]>

Quoted 8 lines

Cc Ralf Baechle <[email protected]>

Cc Brian Norris <[email protected]>

Cc Lars-Peter Clausen <[email protected]>

Cc Manuel Lauss <[email protected]>

Cc Vimal Singh <[email protected]>

Cc Andres Salomon <[email protected]>

Cc Sukumar Ghorai <[email protected]>

Signed-off-by Axel Lin <[email protected]>

Acked-by Olof Johansson <[email protected]> (pasemi portions)

-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

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

Cc David Woodhouse <[email protected]>

Cc Jiandong Zheng <[email protected]>

Cc Scott Branden <[email protected]>

Cc Wan ZongShun <[email protected]>

Cc Dmitry Eremin-Solenikov <[email protected]>

Cc Jamie Iles <[email protected]>

Cc Olof Johansson <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Artem Bityutskiy <[email protected]>

Cc Ralf Baechle <[email protected]>

Cc Brian Norris <[email protected]>

Cc Lars-Peter Clausen <[email protected]>

Cc Manuel Lauss <[email protected]>

Cc Vimal Singh <[email protected]>

Cc Andres Salomon <[email protected]>

Cc Sukumar Ghorai <[email protected]>

Signed-off-by Axel Lin <[email protected]>

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

Cc David Woodhouse <[email protected]>

Cc Jiandong Zheng <[email protected]>

Cc Scott Branden <[email protected]>

Cc Wan ZongShun <[email protected]>

Cc Dmitry Eremin-Solenikov <[email protected]>

Cc Jamie Iles <[email protected]>

Cc Olof Johansson <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Artem Bityutskiy <[email protected]>

Cc Ralf Baechle <[email protected]>

Cc Brian Norris <[email protected]>

Cc Lars-Peter Clausen <[email protected]>

Cc Manuel Lauss <[email protected]>

Cc Vimal Singh <[email protected]>

Cc Andres Salomon <[email protected]>

Cc Sukumar Ghorai <[email protected]>

Signed-off-by Axel Lin <[email protected]>

---
 drivers/mtd/maps/bcm963xx-flash.c   |   13 +------------ drivers/mtd/maps/bfin-async-flash.c |   12 +----------- drivers/mtd/maps/gpio-addr-flash.c  |   12 +----------- drivers/mtd/maps/ixp2000.c          |   12 +----------- drivers/mtd/maps/ixp4xx.c           |   14 +------------- drivers/mtd/maps/latch-addr-flash.c |   12 +----------- drivers/mtd/maps/physmap_of.c       |   13 +------------ drivers/mtd/maps/pxa2xx-flash.c     |   13 +------------ drivers/mtd/maps/rbtx4939-flash.c   |   13 +------------ drivers/mtd/maps/sa1100-flash.c     |   13 +------------ drivers/mtd/maps/sun_uflash.c       |   13 +------------ drivers/mtd/nand/ams-delta.c        |   12 +----------- drivers/mtd/nand/au1550nd.c         |   12 +----------- drivers/mtd/nand/bcm_umi_nand.c     |   13 +------------ drivers/mtd/nand/fsl_elbc_nand.c    |   13 +------------ drivers/mtd/nand/fsl_upm.c          |   12 +----------- drivers/mtd/nand/jz4740_nand.c      |   12 +----------- drivers/mtd/nand/mpc5121_nfc.c      |   14 +------------- drivers/mtd/nand/ndfc.c             |   13 +------------ drivers/mtd/nand/nomadik_nand.c     |   14 +------------- drivers/mtd/nand/nuc900_nand.c      |   13 +------------ drivers/mtd/nand/omap2.c            |   15 +-------------- drivers/mtd/nand/pasemi_nand.c      |   12 +----------- drivers/mtd/nand/plat_nand.c        |   13 +------------ drivers/mtd/nand/pxa3xx_nand.c      |   12 +----------- drivers/mtd/nand/sharpsl.c          |   12 +----------- drivers/mtd/nand/socrates_nand.c    |   13 +------------ drivers/mtd/nand/tmio_nand.c        |   13 +------------ drivers/mtd/onenand/generic.c       |   16 ++-------------- drivers/mtd/onenand/samsung.c       |   13 +------------

 30 files changed, 31 insertions(+), 356 deletions(-)

drivers/mtd/maps/bcm963xx-flash.c +1 -12

index 736ca10..56927f5 100644
@@ -257,18 +257,7 @@ static struct platform_driver bcm63xx_mtd_dev = {
        },
  };
 
-static int __init bcm963xx_mtd_init(void)
-{
-       return platform_driver_register(&bcm63xx_mtd_dev);
-}
-
-static void __exit bcm963xx_mtd_exit(void)
-{
-       platform_driver_unregister(&bcm63xx_mtd_dev);
-}
-
-module_init(bcm963xx_mtd_init);
-module_exit(bcm963xx_mtd_exit);
+module_platform_driver(bcm63xx_mtd_dev);
 
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("Broadcom BCM63xx MTD driver for CFE and RedBoot");

drivers/mtd/maps/bfin-async-flash.c +1 -11

index 6d6b2b5..650126c 100644
@@ -190,17 +190,7 @@ static struct platform_driver bfin_flash_driver = {
        },
  };
 
-static int __init bfin_flash_init(void)
-{
-       return platform_driver_register(&bfin_flash_driver);
-}
-module_init(bfin_flash_init);
-
-static void __exit bfin_flash_exit(void)
-{
-       platform_driver_unregister(&bfin_flash_driver);
-}
-module_exit(bfin_flash_exit);
+module_platform_driver(bfin_flash_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("MTD map driver for Blackfins with flash/ethernet on same async bank");

drivers/mtd/maps/gpio-addr-flash.c +1 -11

index 1ec66f0..33cce89 100644
@@ -279,17 +279,7 @@ static struct platform_driver gpio_flash_driver = {
        },
  };
 
-static int __init gpio_flash_init(void)
-{
-       return platform_driver_register(&gpio_flash_driver);
-}
-module_init(gpio_flash_init);
-
-static void __exit gpio_flash_exit(void)
-{
-       platform_driver_unregister(&gpio_flash_driver);
-}
-module_exit(gpio_flash_exit);
+module_platform_driver(gpio_flash_driver);
 
  MODULE_AUTHOR("Mike Frysinger <[email protected]>");
  MODULE_DESCRIPTION("MTD map driver for flashes addressed physically and with gpios");

drivers/mtd/maps/ixp2000.c +1 -11

index 437fcd2..fc7d4d0 100644
@@ -246,18 +246,8 @@ static struct platform_driver ixp2000_flash_driver = {
        },
  };
 
-static int __init ixp2000_flash_init(void)
-{
-       return platform_driver_register(&ixp2000_flash_driver);
-}
-
-static void __exit ixp2000_flash_exit(void)
-{
-       platform_driver_unregister(&ixp2000_flash_driver);
-}
+module_platform_driver(ixp2000_flash_driver);
 
-module_init(ixp2000_flash_init);
-module_exit(ixp2000_flash_exit);
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Deepak Saxena <[email protected]>");
  MODULE_ALIAS("platform:IXP2000-Flash");

drivers/mtd/maps/ixp4xx.c +1 -13

index 3040901..8b54101 100644
@@ -270,19 +270,7 @@ static struct platform_driver ixp4xx_flash_driver = {
        },
  };
 
-static int __init ixp4xx_flash_init(void)
-{
-       return platform_driver_register(&ixp4xx_flash_driver);
-}
-
-static void __exit ixp4xx_flash_exit(void)
-{
-       platform_driver_unregister(&ixp4xx_flash_driver);
-}
-
-
-module_init(ixp4xx_flash_init);
-module_exit(ixp4xx_flash_exit);
+module_platform_driver(ixp4xx_flash_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("MTD map driver for Intel IXP4xx systems");

drivers/mtd/maps/latch-addr-flash.c +1 -11

index 119baa7..8fed58e 100644
@@ -223,17 +223,7 @@ static struct platform_driver latch_addr_flash_driver = {
        },
  };
 
-static int __init latch_addr_flash_init(void)
-{
-       return platform_driver_register(&latch_addr_flash_driver);
-}
-module_init(latch_addr_flash_init);
-
-static void __exit latch_addr_flash_exit(void)
-{
-       platform_driver_unregister(&latch_addr_flash_driver);
-}
-module_exit(latch_addr_flash_exit);
+module_platform_driver(latch_addr_flash_driver);
 
  MODULE_AUTHOR("David Griego <[email protected]>");

 MODULE_DESCRIPTION("MTD map driver for flashes addressed physically with upper "

drivers/mtd/maps/physmap_of.c +1 -12

index 7d65f9d..2e6fb68 100644
@@ -338,18 +338,7 @@ static struct platform_driver of_flash_driver = {
        .remove         = of_flash_remove,
  };
 
-static int __init of_flash_init(void)
-{
-       return platform_driver_register(&of_flash_driver);
-}
-
-static void __exit of_flash_exit(void)
-{
-       platform_driver_unregister(&of_flash_driver);
-}
-
-module_init(of_flash_init);
-module_exit(of_flash_exit);
+module_platform_driver(of_flash_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Vitaly Wool <[email protected]>");

drivers/mtd/maps/pxa2xx-flash.c +1 -12

index 2a25b67..274e399 100644
@@ -142,18 +142,7 @@ static struct platform_driver pxa2xx_flash_driver = {
        .shutdown       = pxa2xx_flash_shutdown,
  };
 
-static int __init init_pxa2xx_flash(void)
-{
-       return platform_driver_register(&pxa2xx_flash_driver);
-}
-
-static void __exit cleanup_pxa2xx_flash(void)
-{
-       platform_driver_unregister(&pxa2xx_flash_driver);
-}
-
-module_init(init_pxa2xx_flash);
-module_exit(cleanup_pxa2xx_flash);
+module_platform_driver(pxa2xx_flash_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Nicolas Pitre <[email protected]>");

drivers/mtd/maps/rbtx4939-flash.c +1 -12

index 0237f19..bb7d204 100644
@@ -137,18 +137,7 @@ static struct platform_driver rbtx4939_flash_driver = {
        },
  };
 
-static int __init rbtx4939_flash_init(void)
-{
-       return platform_driver_register(&rbtx4939_flash_driver);
-}
-
-static void __exit rbtx4939_flash_exit(void)
-{
-       platform_driver_unregister(&rbtx4939_flash_driver);
-}
-
-module_init(rbtx4939_flash_init);
-module_exit(rbtx4939_flash_exit);
+module_platform_driver(rbtx4939_flash_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("RBTX4939 MTD map driver");

drivers/mtd/maps/sa1100-flash.c +1 -12

index fa9c0a9..ac3a290 100644
@@ -394,18 +394,7 @@ static struct platform_driver sa1100_mtd_driver = {
        },
  };
 
-static int __init sa1100_mtd_init(void)
-{
-       return platform_driver_register(&sa1100_mtd_driver);
-}
-
-static void __exit sa1100_mtd_exit(void)
-{
-       platform_driver_unregister(&sa1100_mtd_driver);
-}
-
-module_init(sa1100_mtd_init);
-module_exit(sa1100_mtd_exit);
+module_platform_driver(sa1100_mtd_driver);
 
  MODULE_AUTHOR("Nicolas Pitre");
  MODULE_DESCRIPTION("SA1100 CFI map driver");

drivers/mtd/maps/sun_uflash.c +1 -12

index 2d66234..175e537 100644
@@ -158,15 +158,4 @@ static struct platform_driver uflash_driver = {
        .remove         = __devexit_p(uflash_remove),
  };
 
-static int __init uflash_init(void)
-{
-       return platform_driver_register(&uflash_driver);
-}
-
-static void __exit uflash_exit(void)
-{
-       platform_driver_unregister(&uflash_driver);
-}
-
-module_init(uflash_init);
-module_exit(uflash_exit);
+module_platform_driver(uflash_driver);

drivers/mtd/nand/ams-delta.c +1 -11

index 9e6b498..3197e97 100644
@@ -280,17 +280,7 @@ static struct platform_driver ams_delta_nand_driver = {
        },
  };
 
-static int __init ams_delta_nand_init(void)
-{
-       return platform_driver_register(&ams_delta_nand_driver);
-}
-module_init(ams_delta_nand_init);
-
-static void __exit ams_delta_nand_exit(void)
-{
-       platform_driver_unregister(&ams_delta_nand_driver);
-}
-module_exit(ams_delta_nand_exit);
+module_platform_driver(ams_delta_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Jonathan McDowell <[email protected]>");

drivers/mtd/nand/au1550nd.c +1 -11

index 77fb4e6..73abbc3 100644
@@ -560,17 +560,7 @@ static struct platform_driver au1550nd_driver = {
        .remove         = __devexit_p(au1550nd_remove),
  };
 
-static int __init au1550nd_load(void)
-{
-       return platform_driver_register(&au1550nd_driver);
-};
-
-static void __exit au1550nd_exit(void)
-{
-       platform_driver_unregister(&au1550nd_driver);
-};
-module_init(au1550nd_load);
-module_exit(au1550nd_exit);
+module_platform_driver(au1550nd_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Embedded Edge, LLC");

drivers/mtd/nand/bcm_umi_nand.c +1 -12

index 46b58d6..50387fd 100644
@@ -546,18 +546,7 @@ static struct platform_driver nand_driver = {
        .resume = bcm_umi_nand_resume,
  };
 
-static int __init nand_init(void)
-{
-       return platform_driver_register(&nand_driver);
-}
-
-static void __exit nand_exit(void)
-{
-       platform_driver_unregister(&nand_driver);
-}
-
-module_init(nand_init);
-module_exit(nand_exit);
+module_platform_driver(nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Broadcom");

drivers/mtd/nand/fsl_elbc_nand.c +1 -12

index eedd8ee..f2f6e87 100644
@@ -971,18 +971,7 @@ static struct platform_driver fsl_elbc_nand_driver = {
        .remove = fsl_elbc_nand_remove,
  };
 
-static int __init fsl_elbc_nand_init(void)
-{
-       return platform_driver_register(&fsl_elbc_nand_driver);
-}
-
-static void __exit fsl_elbc_nand_exit(void)
-{
-       platform_driver_unregister(&fsl_elbc_nand_driver);
-}
-
-module_init(fsl_elbc_nand_init);
-module_exit(fsl_elbc_nand_exit);
+module_platform_driver(fsl_elbc_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Freescale");

drivers/mtd/nand/fsl_upm.c +1 -11

index b4f3cc9..45df542 100644
@@ -353,17 +353,7 @@ static struct platform_driver of_fun_driver = {
        .remove         = __devexit_p(fun_remove),
  };
 
-static int __init fun_module_init(void)
-{
-       return platform_driver_register(&of_fun_driver);
-}
-module_init(fun_module_init);
-
-static void __exit fun_module_exit(void)
-{
-       platform_driver_unregister(&of_fun_driver);
-}
-module_exit(fun_module_exit);
+module_platform_driver(of_fun_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Anton Vorontsov <[email protected]>");

drivers/mtd/nand/jz4740_nand.c +1 -11

index e266407..ac3b9f2 100644
@@ -423,17 +423,7 @@ static struct platform_driver jz_nand_driver = {
        },
  };
 
-static int __init jz_nand_init(void)
-{
-       return platform_driver_register(&jz_nand_driver);
-}
-module_init(jz_nand_init);
-
-static void __exit jz_nand_exit(void)
-{
-       platform_driver_unregister(&jz_nand_driver);
-}
-module_exit(jz_nand_exit);
+module_platform_driver(jz_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");

drivers/mtd/nand/mpc5121_nfc.c +1 -13

index 5ede647..c240cf1 100644
@@ -879,19 +879,7 @@ static struct platform_driver mpc5121_nfc_driver = {
        },
  };
 
-static int __init mpc5121_nfc_init(void)
-{
-       return platform_driver_register(&mpc5121_nfc_driver);
-}
-
-module_init(mpc5121_nfc_init);
-
-static void __exit mpc5121_nfc_cleanup(void)
-{
-       platform_driver_unregister(&mpc5121_nfc_driver);
-}
-
-module_exit(mpc5121_nfc_cleanup);
+module_platform_driver(mpc5121_nfc_driver);
 
  MODULE_AUTHOR("Freescale Semiconductor, Inc.");
  MODULE_DESCRIPTION("MPC5121 NAND MTD driver");

drivers/mtd/nand/ndfc.c +1 -12

index f8aacf4..ec68854 100644
@@ -294,18 +294,7 @@ static struct platform_driver ndfc_driver = {
        .remove = __devexit_p(ndfc_remove),
  };
 
-static int __init ndfc_nand_init(void)
-{
-       return platform_driver_register(&ndfc_driver);
-}
-
-static void __exit ndfc_nand_exit(void)
-{
-       platform_driver_unregister(&ndfc_driver);
-}
-
-module_init(ndfc_nand_init);
-module_exit(ndfc_nand_exit);
+module_platform_driver(ndfc_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Thomas Gleixner <[email protected]>");

drivers/mtd/nand/nomadik_nand.c +1 -13

index b463ecf..673dc6c 100644
@@ -228,19 +228,7 @@ static struct platform_driver nomadik_nand_driver = {
        },
  };
 
-static int __init nand_nomadik_init(void)
-{
-       pr_info("Nomadik NAND driver\n");
-       return platform_driver_register(&nomadik_nand_driver);
-}
-
-static void __exit nand_nomadik_exit(void)
-{
-       platform_driver_unregister(&nomadik_nand_driver);
-}
-
-module_init(nand_nomadik_init);
-module_exit(nand_nomadik_exit);
+module_platform_driver(nomadik_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("ST Microelectronics ([email protected])");

drivers/mtd/nand/nuc900_nand.c +1 -12

index fa8faed..8febe46 100644
@@ -364,18 +364,7 @@ static struct platform_driver nuc900_nand_driver = {
        },
  };
 
-static int __init nuc900_nand_init(void)
-{
-       return platform_driver_register(&nuc900_nand_driver);
-}
-
-static void __exit nuc900_nand_exit(void)
-{
-       platform_driver_unregister(&nuc900_nand_driver);
-}
-
-module_init(nuc900_nand_init);
-module_exit(nuc900_nand_exit);
+module_platform_driver(nuc900_nand_driver);
 
  MODULE_AUTHOR("Wan ZongShun <[email protected]>");
  MODULE_DESCRIPTION("w90p910/NUC9xx nand driver!");

drivers/mtd/nand/omap2.c +1 -14

index f745f00..b3a883e 100644
@@ -1145,20 +1145,7 @@ static struct platform_driver omap_nand_driver = {
        },
  };
 
-static int __init omap_nand_init(void)
-{
-       pr_info("%s driver initializing\n", DRIVER_NAME);
-
-       return platform_driver_register(&omap_nand_driver);
-}
-
-static void __exit omap_nand_exit(void)
-{
-       platform_driver_unregister(&omap_nand_driver);
-}
-
-module_init(omap_nand_init);
-module_exit(omap_nand_exit);
+module_platform_driver(omap_nand_driver);
 
  MODULE_ALIAS("platform:" DRIVER_NAME);
  MODULE_LICENSE("GPL");

drivers/mtd/nand/pasemi_nand.c +1 -11

index a97264e..974dbf8 100644
@@ -230,17 +230,7 @@ static struct platform_driver pasemi_nand_driver =
        .remove         = pasemi_nand_remove,
  };
 
-static int __init pasemi_nand_init(void)
-{
-       return platform_driver_register(&pasemi_nand_driver);
-}
-module_init(pasemi_nand_init);
-
-static void __exit pasemi_nand_exit(void)
-{
-       platform_driver_unregister(&pasemi_nand_driver);
-}
-module_exit(pasemi_nand_exit);
+module_platform_driver(pasemi_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Egor Martovetsky <[email protected]>");

drivers/mtd/nand/plat_nand.c +1 -12

index ea8e123..7f2da69 100644
@@ -148,18 +148,7 @@ static struct platform_driver plat_nand_driver = {
        },
  };
 
-static int __init plat_nand_init(void)
-{
-       return platform_driver_register(&plat_nand_driver);
-}
-
-static void __exit plat_nand_exit(void)
-{
-       platform_driver_unregister(&plat_nand_driver);
-}
-
-module_init(plat_nand_init);
-module_exit(plat_nand_exit);
+module_platform_driver(plat_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Vitaly Wool");

drivers/mtd/nand/pxa3xx_nand.c +1 -11

index 9eb7f87..90d6016 100644
@@ -1311,17 +1311,7 @@ static struct platform_driver pxa3xx_nand_driver = {
        .resume         = pxa3xx_nand_resume,
  };
 
-static int __init pxa3xx_nand_init(void)
-{
-       return platform_driver_register(&pxa3xx_nand_driver);
-}
-module_init(pxa3xx_nand_init);
-
-static void __exit pxa3xx_nand_exit(void)
-{
-       platform_driver_unregister(&pxa3xx_nand_driver);
-}
-module_exit(pxa3xx_nand_exit);
+module_platform_driver(pxa3xx_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("PXA3xx NAND controller driver");

drivers/mtd/nand/sharpsl.c +1 -11

index 619d2a5..b175c0f 100644
@@ -230,17 +230,7 @@ static struct platform_driver sharpsl_nand_driver = {
        .remove         = __devexit_p(sharpsl_nand_remove),
  };
 
-static int __init sharpsl_nand_init(void)
-{
-       return platform_driver_register(&sharpsl_nand_driver);
-}
-module_init(sharpsl_nand_init);
-
-static void __exit sharpsl_nand_exit(void)
-{
-       platform_driver_unregister(&sharpsl_nand_driver);
-}
-module_exit(sharpsl_nand_exit);
+module_platform_driver(sharpsl_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Richard Purdie <[email protected]>");

drivers/mtd/nand/socrates_nand.c +1 -12

index 0fb24f9..e02b08b 100644
@@ -273,18 +273,7 @@ static struct platform_driver socrates_nand_driver = {
        .remove         = __devexit_p(socrates_nand_remove),
  };
 
-static int __init socrates_nand_init(void)
-{
-       return platform_driver_register(&socrates_nand_driver);
-}
-
-static void __exit socrates_nand_exit(void)
-{
-       platform_driver_unregister(&socrates_nand_driver);
-}
-
-module_init(socrates_nand_init);
-module_exit(socrates_nand_exit);
+module_platform_driver(socrates_nand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Ilya Yanok");

drivers/mtd/nand/tmio_nand.c +1 -12

index beebd95..6caa0cd 100644
@@ -533,18 +533,7 @@ static struct platform_driver tmio_driver = {
        .resume         = tmio_resume,
  };
 
-static int __init tmio_init(void)
-{
-       return platform_driver_register(&tmio_driver);
-}
-
-static void __exit tmio_exit(void)
-{
-       platform_driver_unregister(&tmio_driver);
-}
-
-module_init(tmio_init);
-module_exit(tmio_exit);
+module_platform_driver(tmio_driver);
 
  MODULE_LICENSE("GPL v2");
  MODULE_AUTHOR("Ian Molton, Dirk Opfer, Chris Humbert, Dmitry Baryshkov");

drivers/mtd/onenand/generic.c +2 -14

index 7813095..0ccd5bf 100644
@@ -115,21 +115,9 @@ static struct platform_driver generic_onenand_driver = {
        .remove         = __devexit_p(generic_onenand_remove),
  };
 
-MODULE_ALIAS("platform:" DRIVER_NAME);
-
-static int __init generic_onenand_init(void)
-{
-       return platform_driver_register(&generic_onenand_driver);
-}
-
-static void __exit generic_onenand_exit(void)
-{
-       platform_driver_unregister(&generic_onenand_driver);
-}
-
-module_init(generic_onenand_init);
-module_exit(generic_onenand_exit);
+module_platform_driver(generic_onenand_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Kyungmin Park <[email protected]>");
  MODULE_DESCRIPTION("Glue layer for OneNAND flash on generic boards");
+MODULE_ALIAS("platform:" DRIVER_NAME);

drivers/mtd/onenand/samsung.c +0 -6

index 5474547..fa1ee43 100644
@@ -1133,18 +1133,7 @@ static struct platform_driver s3c_onenand_driver = {
        .remove         = __devexit_p(s3c_onenand_remove),
  };
 
-static int __init s3c_onenand_init(void)
-{
-       return platform_driver_register(&s3c_onenand_driver);
-}
-
-static void __exit s3c_onenand_exit(void)

--
1.7.5.4

Acked-by Wan ZongShun <[email protected]>

Thanks!

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

Cc David Woodhouse<[email protected]>

Cc Jiandong Zheng<[email protected]>

Cc Scott Branden<[email protected]>

Cc Wan ZongShun<[email protected]>

Cc Dmitry Eremin-Solenikov<[email protected]>

Cc Jamie Iles<[email protected]>

Cc Olof Johansson<[email protected]>

Cc Kyungmin Park<[email protected]>

Cc Haojian Zhuang<[email protected]>

Cc Artem Bityutskiy<[email protected]>

Cc Ralf Baechle<[email protected]>

Cc Brian Norris<[email protected]>

Cc Lars-Peter Clausen<[email protected]>

Cc Manuel Lauss<[email protected]>

Cc Vimal Singh<[email protected]>

Cc Andres Salomon<[email protected]>

Cc Sukumar Ghorai<[email protected]>

Signed-off-by Axel Lin<[email protected]>

---

  drivers/mtd/nand/bcm_umi_nand.c     |   13 +------------

drivers/mtd/nand/bcm_umi_nand.c +0 -6

index 46b58d6..50387fd 100644
@@ -546,18 +546,7 @@ static struct platform_driver nand_driver = {
         .resume = bcm_umi_nand_resume,
  };
 
-static int __init nand_init(void)
-{
-       return platform_driver_register(&nand_driver);
-}
-
-static void __exit nand_exit(void)

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

Quoted 3 lines · Axel Lin

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

Pushed to l2-mtd-2.6.git, thanks. However, I got rejects in the drivers/mtd/nand/au1550nd.c file, so this part was ignored. Please, take a look at this and send an incremental change. Thanks!

Quoted 5 lines · Artem Bityutskiy

Quoted 3 lines · Axel Lin

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

Quoted 3 lines

Pushed to l2-mtd-2.6.git, thanks. However, I got rejects in the drivers/mtd/nand/au1550nd.c file, so this part was ignored. Please, take a look at this and send an incremental change. Thanks!

Axel's patch is against a bigger change to au1550nd.c (which introduced the platform driver in the first place) available in linux-next.