MODULE_ALIAS() in char devices
Subsystems (6)
PATCH 2/3 MODULE_ALIAS() in char devices
Name: MODULE_ALIAS inside modules: character devices
Author: Rusty Russell
Status: Booted on 2.6.0-test4-bk3
D: Previously, default aliases were hardwired into modutils. Now they
D: should be inside the modules, using MODULE_ALIAS() (they will be overridden
D: by any user alias).
arch/i386/kernel/apm.c +1 -1
@@ -2080,4 +2080,4 @@ MODULE_PARM_DESC(idle_period,MODULE_PARM (smp,"i" );MODULE_PARM_DESC (smp,"Set this to enable APM use on an SMP platform. Use with caution on older systems" ); - +MODULE_ALIAS_MISCDEV (APM_MINOR_DEV );
drivers/char/agp/backend.c +1 -0
@@ -317,6 +317,7 @@ void __exit agp_exit(void)MODULE_AUTHOR ("Dave Jones <[email protected]>" );MODULE_DESCRIPTION ("AGP GART driver" );MODULE_LICENSE ("GPL and additional rights" ); +MODULE_ALIAS_MISCDEV (AGPGART_MINOR );module_init (agp_init);module_exit (agp_exit);
drivers/char/agp/frontend.c +0 -1
@@ -1097,4 +1097,3 @@ void agp_frontend_cleanup(void) {misc_deregister (&agp_miscdev); } -
drivers/char/busmouse.c +1 -0
@@ -452,4 +452,5 @@ EXPORT_SYMBOL(busmouse_add_buttons);EXPORT_SYMBOL (register_busmouse);EXPORT_SYMBOL (unregister_busmouse); +MODULE_ALIAS_MISCDEV (BUSMOUSE_MINOR );MODULE_LICENSE ("GPL" );
drivers/char/lp.c +1 -0
@@ -965,4 +965,5 @@ __setup("lp=", lp_setup);module_init (lp_init_module);module_exit (lp_cleanup_module); +MODULE_ALIAS ("char-major-" __stringify(LP_MAJOR ));MODULE_LICENSE ("GPL" );
drivers/char/nvram.c +1 -0
@@ -923,3 +923,4 @@ EXPORT_SYMBOL(__nvram_check_checksum);EXPORT_SYMBOL (nvram_check_checksum);EXPORT_SYMBOL (__nvram_set_checksum);EXPORT_SYMBOL (nvram_set_checksum); +MODULE_ALIAS_MISCDEV (NVRAM_MINOR );
drivers/char/rtc.c +1 -0
@@ -1280,3 +1280,4 @@ static void set_rtc_irq_bit(unsigned chaMODULE_AUTHOR ("Paul Gortmaker" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_MISCDEV (RTC_MINOR );
drivers/char/watchdog/wdt.c +2 -0
@@ -579,4 +579,6 @@ module_exit(wdt_exit);MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("Driver for ISA ICS watchdog cards (WDT500/501)" ); +MODULE_ALIAS_MISCDEV (WATCHDOG_MINOR ); +MODULE_ALIAS_MISCDEV (TEMP_MINOR );MODULE_LICENSE ("GPL" );
drivers/media/video/bttv-driver.c +1 -0
@@ -115,6 +115,7 @@ MODULE_PARM(v4l2,"i");MODULE_DESCRIPTION ("bttv - v4l/v4l2 driver module for bt848/878 based cards" );MODULE_AUTHOR ("Ralph Metzler & Marcus Metzler & Gerd Knorr" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_CHARDEV_MAJOR (VIDEO_MAJOR );/* kernel args */ #ifndef MODULE
drivers/net/ppp_generic.c +1 -0
@@ -2670,3 +2670,4 @@ EXPORT_SYMBOL(ppp_unregister_compressor)EXPORT_SYMBOL (all_ppp_units);/* for debugging */ EXPORT_SYMBOL (all_channels);/* for debugging */ MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_CHARDEV_MAJOR (PPP_MAJOR );
drivers/net/tun.c +1 -0
@@ -640,3 +640,4 @@ void tun_cleanup(void)module_init (tun_init);module_exit (tun_cleanup);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_MISCDEV (TUN_MINOR );
include/linux/device.h +5 -0
@@ -398,4 +398,9 @@ extern void firmware_unregister(struct s #define dev_warn(dev, format, arg...) \ dev_printk(KERN_WARNING , dev , format , ## arg) +/* Create alias, so I can be autoloaded. */ +#define MODULE_ALIAS_CHARDEV (major,minor) \ + MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor)) +#define MODULE_ALIAS_CHARDEV_MAJOR (major) \ + MODULE_ALIAS("char-major-" __stringify(major) "-*")#endif /* _DEVICE_H_ */
include/linux/miscdevice.h +5 -0
@@ -1,5 +1,7 @@#ifndef _LINUX_MISCDEVICE_H#define _LINUX_MISCDEVICE_H +#include <linux/module.h> +#include <linux/major.h> #define BUSMOUSE_MINOR 0#define PSMOUSE_MINOR 1
@@ -48,4 +50,7 @@ struct miscdeviceextern int misc_register (struct miscdevice * misc);extern int misc_deregister (struct miscdevice * misc); +#define MODULE_ALIAS_MISCDEV (minor) \ + MODULE_ALIAS("char-major-" __stringify(MISC_MAJOR) \ + "-" __stringify(minor))#endif
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.