[IRDA]: Rename dongle entry points for consistency.

diff --git a/drivers/net/irda/act200l-sir.c b/drivers/net/irda/act200l-sir.c
index 5786e239ffb6e7b2e7fd970ae98cb29bbcb96e5e..4b7a227fd719127fb7acc7a8f3a6bc7a248d01fe 100644 (file)
--- a/drivers/net/irda/act200l-sir.c
+++ b/drivers/net/irda/act200l-sir.c
@@ -93,12 +93,12 @@ static struct dongle_driver act200l = {
        .set_speed      = act200l_change_speed,
 };
 
-static int __init act200l_init(void)
+static int __init act200l_sir_init(void)
 {
        return irda_register_dongle(&act200l);
 }
 
-static void __exit act200l_cleanup(void)
+static void __exit act200l_sir_cleanup(void)
 {
        irda_unregister_dongle(&act200l);
 }
@@ -254,5 +254,5 @@ MODULE_DESCRIPTION("ACTiSYS ACT-IR200L dongle driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-10"); /* IRDA_ACT200L_DONGLE */
 
-module_init(act200l_init);
-module_exit(act200l_cleanup);
+module_init(act200l_sir_init);
+module_exit(act200l_sir_cleanup);

diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
index b118197b94d2100fd0c0f226774b43cd40652758..d3c56ee64345f365cbb7b577eb071f4fce788650 100644 (file)
--- a/drivers/net/irda/girbil-sir.c
+++ b/drivers/net/irda/girbil-sir.c
@@ -72,12 +72,12 @@ static struct dongle_driver girbil = {
        .set_speed      = girbil_change_speed,
 };
 
-static int __init girbil_init(void)
+static int __init girbil_sir_init(void)
 {
        return irda_register_dongle(&girbil);
 }
 
-static void __exit girbil_cleanup(void)
+static void __exit girbil_sir_cleanup(void)
 {
        irda_unregister_dongle(&girbil);
 }
@@ -254,5 +254,5 @@ MODULE_DESCRIPTION("Greenwich GIrBIL dongle driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-4"); /* IRDA_GIRBIL_DONGLE */
 
-module_init(girbil_init);
-module_exit(girbil_cleanup);
+module_init(girbil_sir_init);
+module_exit(girbil_sir_cleanup);

diff --git a/drivers/net/irda/mcp2120-sir.c b/drivers/net/irda/mcp2120-sir.c
index 0cd0f39464ecd2eaa5a7edb05b8bf567f14130f2..25908ffa4a176a4966ed8d89e6fdbb5ff77c5797 100644 (file)
--- a/drivers/net/irda/mcp2120-sir.c
+++ b/drivers/net/irda/mcp2120-sir.c
@@ -49,12 +49,12 @@ static struct dongle_driver mcp2120 = {
        .set_speed      = mcp2120_change_speed,
 };
 
-static int __init mcp2120_init(void)
+static int __init mcp2120_sir_init(void)
 {
        return irda_register_dongle(&mcp2120);
 }
 
-static void __exit mcp2120_cleanup(void)
+static void __exit mcp2120_sir_cleanup(void)
 {
        irda_unregister_dongle(&mcp2120);
 }
@@ -226,5 +226,5 @@ MODULE_DESCRIPTION("Microchip MCP2120");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-9"); /* IRDA_MCP2120_DONGLE */
 
-module_init(mcp2120_init);
-module_exit(mcp2120_cleanup);
+module_init(mcp2120_sir_init);
+module_exit(mcp2120_sir_cleanup);

diff --git a/drivers/net/irda/old_belkin-sir.c b/drivers/net/irda/old_belkin-sir.c
index 5c43c01149d06f0f2f00f5c28b6b3d73a61450fa..8c22c7374a234e2076e86eebd75ab0bdfa6a8d8a 100644 (file)
--- a/drivers/net/irda/old_belkin-sir.c
+++ b/drivers/net/irda/old_belkin-sir.c
@@ -78,12 +78,12 @@ static struct dongle_driver old_belkin = {
        .set_speed      = old_belkin_change_speed,
 };
 
-static int __init old_belkin_init(void)
+static int __init old_belkin_sir_init(void)
 {
        return irda_register_dongle(&old_belkin);
 }
 
-static void __exit old_belkin_cleanup(void)
+static void __exit old_belkin_sir_cleanup(void)
 {
        irda_unregister_dongle(&old_belkin);
 }
@@ -152,5 +152,5 @@ MODULE_DESCRIPTION("Belkin (old) SmartBeam dongle driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-7"); /* IRDA_OLD_BELKIN_DONGLE */
 
-module_init(old_belkin_init);
-module_exit(old_belkin_cleanup);
+module_init(old_belkin_sir_init);
+module_exit(old_belkin_sir_cleanup);