The Kconfig currently controlling compilation of this code is: drivers/char/Kconfig:config TILE_SROM drivers/char/Kconfig: bool "Character-device access via hypervisor to the Tilera SPI ROM"
...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no 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 delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. 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. We leave the moduleparam.h since the file does declare some variables via module_param(). Cc: Arnd Bergmann <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Chris Metcalf <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> --- drivers/char/tile-srom.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c index 69f6b4acc377..d7ae84b1930e 100644 --- a/drivers/char/tile-srom.c +++ b/drivers/char/tile-srom.c @@ -18,7 +18,6 @@ * Greg Kroah-Hartman, published by O'Reilly Media, Inc. */ -#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> /* printk() */ #include <linux/slab.h> /* kmalloc() */ @@ -70,8 +69,6 @@ struct srom_dev { static int srom_major; /* Dynamic major by default */ module_param(srom_major, int, 0); -MODULE_AUTHOR("Tilera Corporation"); -MODULE_LICENSE("GPL"); static int srom_devs; /* Number of SROM partitions */ static struct cdev srom_cdev; @@ -454,19 +451,4 @@ fail_mem: kfree(srom_devices); return result; } - -/** srom_cleanup() - Clean up the driver's module. */ -static void srom_cleanup(void) -{ - int i; - for (i = 0; i < srom_devs; i++) - device_destroy(srom_class, MKDEV(srom_major, i)); - class_destroy(srom_class); - cdev_del(&srom_cdev); - platform_device_unregister(srom_parent); - unregister_chrdev_region(MKDEV(srom_major, 0), srom_devs); - kfree(srom_devices); -} - -module_init(srom_init); -module_exit(srom_cleanup); +device_initcall(srom_init); -- 2.8.4
