From: Jean Tourrilhes <jt@bougret.hpl.hp.com>
To: "David S. Miller" <davem@redhat.com>,
Linux kernel mailing list <linux-kernel@vger.kernel.org>
Subject: [PATCH 2.6 IrDA] dongles-12_dup_symbols
Date: Wed, 25 Feb 2004 19:22:46 -0800 [thread overview]
Message-ID: <20040226032246.GR32263@bougret.hpl.hp.com> (raw)
ir263_dongles-12_dup_symbols.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
o [FEATURE] rename dongle entry points for consistency
diff -u -p linux/drivers/net/irda.d9/act200l-sir.c linux/drivers/net/irda/act200l-sir.c
--- linux/drivers/net/irda.d9/act200l-sir.c Wed Feb 18 11:09:20 2004
+++ linux/drivers/net/irda/act200l-sir.c Wed Feb 25 18:28:53 2004
@@ -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 d
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 -u -p linux/drivers/net/irda.d9/girbil-sir.c linux/drivers/net/irda/girbil-sir.c
--- linux/drivers/net/irda.d9/girbil-sir.c Wed Feb 18 11:09:20 2004
+++ linux/drivers/net/irda/girbil-sir.c Wed Feb 25 18:29:33 2004
@@ -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 don
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 -u -p linux/drivers/net/irda.d9/mcp2120-sir.c linux/drivers/net/irda/mcp2120-sir.c
--- linux/drivers/net/irda.d9/mcp2120-sir.c Wed Feb 18 11:09:20 2004
+++ linux/drivers/net/irda/mcp2120-sir.c Wed Feb 25 18:30:05 2004
@@ -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 -u -p linux/drivers/net/irda.d9/old_belkin-sir.c linux/drivers/net/irda/old_belkin-sir.c
--- linux/drivers/net/irda.d9/old_belkin-sir.c Wed Feb 18 11:09:20 2004
+++ linux/drivers/net/irda/old_belkin-sir.c Wed Feb 25 18:31:02 2004
@@ -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) SmartBe
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);
reply other threads:[~2004-02-26 3:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040226032246.GR32263@bougret.hpl.hp.com \
--to=jt@bougret.hpl.hp.com \
--cc=davem@redhat.com \
--cc=jt@hpl.hp.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®