mtd: maps: make uclinux.c driver more explicitly non-modular

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=025ce02d92b67d6c702676c11f7f1f5e8f0a81fa
Commit:     025ce02d92b67d6c702676c11f7f1f5e8f0a81fa
Parent:     08922f644878c9163ada8df3ef9def89be1d5e90
Author:     Paul Gortmaker <paul.gortmaker at windriver.com>
AuthorDate: Sun Mar 27 12:13:54 2016 -0400
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Apr 25 20:19:13 2016 -0700

    mtd: maps: make uclinux.c driver more explicitly non-modular
    
    The Kconfig for this support is currently declared with:
    
    config MTD_UCLINUX
            bool "Generic uClinux RAM/ROM filesystem support"
    
    ...meaning that it currently is not being built as a module by anyone.
    Lets remove as much of the modular evidence that we can, so that when
    reading the driver there is less doubt it is builtin-only.
    
    Since module_init translates to device_initcall in the non-modular
    case, the init ordering remains unchanged with this commit.
    
    We also replace module.h with moduleparam.h since the file does use
    a module_param,  and leaving it as such is currently the easiest way
    to remain compatible with existing boot arg use cases.
    
    We also delete the MODULE_LICENSE tag etc. since all that information
    was (or is now) contained at the top of the file in the comments.
    
    Cc: David Woodhouse <dwmw2 at infradead.org>
    Cc: Greg Ungerer <gerg at snapgear.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/maps/uclinux.c | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index c1af83d..00a8190 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -4,11 +4,13 @@
  *	uclinux.c -- generic memory mapped MTD driver for uclinux
  *
  *	(C) Copyright 2002, Greg Ungerer (gerg at snapgear.com)
+ *
+ *      License: GPL
  */
 
 /****************************************************************************/
 
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -117,27 +119,6 @@ static int __init uclinux_mtd_init(void)
 
 	return(0);
 }
-
-/****************************************************************************/
-
-static void __exit uclinux_mtd_cleanup(void)
-{
-	if (uclinux_ram_mtdinfo) {
-		mtd_device_unregister(uclinux_ram_mtdinfo);
-		map_destroy(uclinux_ram_mtdinfo);
-		uclinux_ram_mtdinfo = NULL;
-	}
-	if (uclinux_ram_map.virt)
-		uclinux_ram_map.virt = 0;
-}
-
-/****************************************************************************/
-
-module_init(uclinux_mtd_init);
-module_exit(uclinux_mtd_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Greg Ungerer <gerg at snapgear.com>");
-MODULE_DESCRIPTION("Generic MTD for uClinux");
+device_initcall(uclinux_mtd_init);
 
 /****************************************************************************/