Skip to contentSkip to conversation

MODULE_ALIAS for IRDA dongles

PATCH In review Rusty Russell 2 participants 2 messages Sep 3, 2003 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MODULE_ALIAS for IRDA dongles

Rather than hardcoded names in modprobe, modules can offer their own aliases (which are overridden by config files).

Here are the IRDA dongle ones.

Please apply,
Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Name: Module Aliases Inside Modules: IRDA
Author: Rusty Russell
Status: Trivial

D: MODULE_ALIAS() macros for IRDA.

drivers/net/irda/act200l.c +1 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/act200l.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/act200l.c
@@ -280,6 +280,7 @@ static int act200l_reset(struct irda_tas
 MODULE_AUTHOR("SHIMIZU Takuya <[email protected]>");
 MODULE_DESCRIPTION("ACTiSYS ACT-IR200L dongle driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-10"); /* IRDA_ACT200L_DONGLE */
 
 /*
  * Function init_module (void)
drivers/net/irda/actisys-sir.c +2 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/actisys-sir.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/actisys-sir.c
@@ -235,6 +235,8 @@ static int actisys_reset(struct sir_dev 
 MODULE_AUTHOR("Dag Brattli <[email protected]> - Jean Tourrilhes <[email protected]>");
 MODULE_DESCRIPTION("ACTiSYS IR-220L and IR-220L+ dongle driver");	
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-2"); /* IRDA_ACTISYS_DONGLE */
+MODULE_ALIAS("irda-dongle-3"); /* IRDA_ACTISYS_PLUS_DONGLE */
 
 module_init(actisys_sir_init);
 module_exit(actisys_sir_cleanup);
drivers/net/irda/actisys.c +2 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/actisys.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/actisys.c
@@ -270,6 +270,8 @@ static int actisys_reset(struct irda_tas
 MODULE_AUTHOR("Dag Brattli <[email protected]> - Jean Tourrilhes <[email protected]>");
 MODULE_DESCRIPTION("ACTiSYS IR-220L and IR-220L+ dongle driver");	
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-ongle-2"); /* IRDA_ACTISYS_DONGLE */
+MODULE_ALIAS("irda-dongle-3"); /* IRDA_ACTISYS_PLUS_DONGLE */
 
 		
 /*
drivers/net/irda/ep7211_ir.c +1 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/ep7211_ir.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/ep7211_ir.c
@@ -120,6 +120,7 @@ static void __exit ep7211_ir_cleanup(voi
 MODULE_AUTHOR("Jon McClintock <[email protected]>");
 MODULE_DESCRIPTION("EP7211 I/R driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-8"); /* IRDA_EP7211_IR */
 		
 module_init(ep7211_ir_init);
 module_exit(ep7211_ir_cleanup);
drivers/net/irda/esi-sir.c +1 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/esi-sir.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/esi-sir.c
@@ -139,6 +139,7 @@ static int esi_reset(struct sir_dev *dev
 MODULE_AUTHOR("Dag Brattli <[email protected]>");
 MODULE_DESCRIPTION("Extended Systems JetEye PC dongle driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-1"); /* IRDA_ESI_DONGLE */
 
 module_init(esi_sir_init);
 module_exit(esi_sir_cleanup);
drivers/net/irda/esi.c +1 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/esi.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/esi.c
@@ -133,6 +133,7 @@ static int esi_reset(struct irda_task *t
 MODULE_AUTHOR("Dag Brattli <[email protected]>");
 MODULE_DESCRIPTION("Extended Systems JetEye PC dongle driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-1"); /* IRDA_ESI_DONGLE */
 
 /*
  * Function init_module (void)
drivers/net/irda/girbil.c +1 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/girbil.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/girbil.c
@@ -232,7 +232,7 @@ static int girbil_reset(struct irda_task
 MODULE_AUTHOR("Dag Brattli <[email protected]>");
 MODULE_DESCRIPTION("Greenwich GIrBIL dongle driver");
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("irda-dongle-4"); /* IRDA_GIRBIL_DONGLE */
 	
 /*
  * Function init_module (void)
drivers/net/irda/litelink.c +1 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/litelink.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/litelink.c
@@ -164,7 +164,7 @@ static int litelink_reset(struct irda_ta
 MODULE_AUTHOR("Dag Brattli <[email protected]>");
 MODULE_DESCRIPTION("Parallax Litelink dongle driver");	
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("irda-dongle-5"); /* IRDA_LITELINK_DONGLE */
 		
 /*
  * Function init_module (void)
drivers/net/irda/ma600.c +1 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/ma600.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/ma600.c
@@ -336,6 +336,7 @@ int ma600_reset(struct irda_task *task)
 MODULE_AUTHOR("Leung <[email protected]> http://www.engsvr.ust/~eetwl95");
 MODULE_DESCRIPTION("MA600 dongle driver version 0.1");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-11"); /* IRDA_MA600_DONGLE */
 		
 /*
  * Function init_module (void)
drivers/net/irda/mcp2120.c +1 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/mcp2120.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/mcp2120.c
@@ -223,7 +223,7 @@ static int mcp2120_reset(struct irda_tas
 MODULE_AUTHOR("Felix Tang <[email protected]>");
 MODULE_DESCRIPTION("Microchip MCP2120");
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("irda-dongle-9"); /* IRDA_MCP2120_DONGLE */
 	
 /*
  * Function init_module (void)
drivers/net/irda/old_belkin.c +1 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/old_belkin.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/old_belkin.c
@@ -149,7 +149,7 @@ static int old_belkin_reset(struct irda_
 MODULE_AUTHOR("Jean Tourrilhes <[email protected]>");
 MODULE_DESCRIPTION("Belkin (old) SmartBeam dongle driver");	
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("irda-dongle-7"); /* IRDA_OLD_BELKIN_DONGLE */
 
 /*
  * Function init_module (void)
drivers/net/irda/tekram-sir.c +1 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/tekram-sir.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/tekram-sir.c
@@ -242,6 +242,7 @@ static int tekram_reset(struct sir_dev *
 MODULE_AUTHOR("Dag Brattli <[email protected]>");
 MODULE_DESCRIPTION("Tekram IrMate IR-210B dongle driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-0"); /* IRDA_TEKRAM_DONGLE */
 		
 module_init(tekram_sir_init);
 module_exit(tekram_sir_cleanup);
drivers/net/irda/tekram.c +1 -0
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .12950-linux-2.6.0-test4-bk4/drivers/net/irda/tekram.c .12950-linux-2.6.0-test4-bk4.updated/drivers/net/irda/tekram.c
@@ -265,6 +265,7 @@ int tekram_reset(struct irda_task *task)
 MODULE_AUTHOR("Dag Brattli <[email protected]>");
 MODULE_DESCRIPTION("Tekram IrMate IR-210B dongle driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-0"); /* IRDA_TEKRAM_DONGLE */
 		
 /*
  * Function init_module (void)
#1 lore raw
Quoted 7 lines · Rusty Russell

Rather than hardcoded names in modprobe, modules can offer their own aliases (which are overridden by config files).

Here are the IRDA dongle ones.

Please apply,
Rusty.

Works for me (in case you want to send that direct), as long
as you fix the typo below. If you want, I'll send this patch via the usual route.

Quoted 1 line

+MODULE_ALIAS("irda-ongle-2"); /* IRDA_ACTISYS_DONGLE */

You need to nail that one (that's a french/english joke).

Thanks !

Jean