Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 487722cf authored by Jean Delvare's avatar Jean Delvare Committed by Wim Van Sebroeck
Browse files

watchdog: Get rid of MODULE_ALIAS_MISCDEV statements 



I just can't find any value in MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR)
and MODULE_ALIAS_MISCDEV(TEMP_MINOR) statements.

Either the device is enumerated and the driver already has a module
alias (e.g. PCI, USB etc.) that will get the right driver loaded
automatically.

Or the device is not enumerated and loading its driver will lead to
more or less intrusive hardware poking. Such hardware poking should be
limited to a bare minimum, so the user should really decide which
drivers should be tried and in what order. Trying them all in
arbitrary order can't do any good.

On top of that, loading that many drivers at once bloats the kernel
log. Also many drivers will stay loaded afterward, bloating the output
of "lsmod" and wasting memory. Some modules (cs5535_mfgpt which gets
loaded as a dependency) can't even be unloaded!

If defining char-major-10-130 is needed then it should happen in
user-space.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Cc: Jim Cromie <jim.cromie@gmail.com>
parent 67b9fbdf

drivers/watchdog/acquirewdt.c

+1 −3
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ 
#include <linux/types.h>		/* For standard types (like size_t) */

#include <linux/errno.h>		/* For the -ENODEV/... values */

#include <linux/kernel.h>		/* For printk/panic/... */

#include <linux/miscdevice.h>		/* For MODULE_ALIAS_MISCDEV

							(WATCHDOG_MINOR) */

#include <linux/miscdevice.h>		/* For struct miscdevice */

#include <linux/watchdog.h>		/* For the watchdog specific items */

#include <linux/fs.h>			/* For file operations */

#include <linux/ioport.h>		/* For io-port access */
@@ -337,4 +336,3 @@ module_exit(acq_exit); 
MODULE_AUTHOR("David Woodhouse");

MODULE_DESCRIPTION("Acquire Inc. Single Board Computer Watchdog Timer driver");

MODULE_LICENSE("GPL");
 
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

drivers/watchdog/advantechwdt.c

+0 −1
Original line number Diff line number Diff line
@@ -345,4 +345,3 @@ module_exit(advwdt_exit); 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("Marek Michalkiewicz <marekm@linux.org.pl>");

MODULE_DESCRIPTION("Advantech Single Board Computer WDT driver");
 
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

drivers/watchdog/alim1535_wdt.c

+0 −1
Original line number Diff line number Diff line
@@ -452,4 +452,3 @@ module_exit(watchdog_exit); 
MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("ALi M1535 PMU Watchdog Timer driver");

MODULE_LICENSE("GPL");
 
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

drivers/watchdog/alim7101_wdt.c

+0 −1
Original line number Diff line number Diff line
@@ -425,4 +425,3 @@ MODULE_DEVICE_TABLE(pci, alim7101_pci_tbl); 
MODULE_AUTHOR("Steve Hill");

MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver");

MODULE_LICENSE("GPL");
 
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

drivers/watchdog/ar7_wdt.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
MODULE_AUTHOR("Nicolas Thill <nico@openwrt.org>");

MODULE_DESCRIPTION(LONGNAME);

MODULE_LICENSE("GPL");

MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);



static int margin = 60;

module_param(margin, int, 0);