From: Dmitry Torokhov <dtor_core@ameritech.net>
To: Vojtech Pavlik <vojtech@suse.cz>
Cc: akpm@osdl.org, petero2@telia.com, linux-kernel@vger.kernel.org
Subject: [PATCH 1/6] serio: rename serio_[un]register_slave_port to __serio_[un]register_port
Date: Tue, 30 Sep 2003 01:06:20 -0500 [thread overview]
Message-ID: <200309300106.20744.dtor_core@ameritech.net> (raw)
In-Reply-To: <200309300052.49908.dtor_core@ameritech.net>
Input: rename serio_{register|unregister}_slave_port to
__serio_{register|unregister}_port to better follow
locked/lockless naming convention
drivers/input/mouse/synaptics.c | 4 ++--
drivers/input/serio/serio.c | 23 ++++++++++-------------
include/linux/serio.h | 4 ++--
3 files changed, 14 insertions(+), 17 deletions(-)
===================================================================
diff -Nru a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
--- a/drivers/input/mouse/synaptics.c Tue Sep 30 01:02:23 2003
+++ b/drivers/input/mouse/synaptics.c Tue Sep 30 01:02:23 2003
@@ -294,7 +294,7 @@
port->driver = psmouse;
printk(KERN_INFO "serio: %s port at %s\n", port->name, psmouse->phys);
- serio_register_slave_port(port);
+ __serio_register_port(port); /* already have serio_sem */
/* adjust the touchpad to child's choice of protocol */
child = port->private;
@@ -406,7 +406,7 @@
if (psmouse->type == PSMOUSE_SYNAPTICS && priv) {
synaptics_mode_cmd(psmouse, 0);
if (priv->ptport) {
- serio_unregister_slave_port(priv->ptport);
+ __serio_unregister_port(priv->ptport); /* already have serio_sem */
kfree(priv->ptport);
}
kfree(priv);
diff -Nru a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
--- a/drivers/input/serio/serio.c Tue Sep 30 01:02:23 2003
+++ b/drivers/input/serio/serio.c Tue Sep 30 01:02:23 2003
@@ -49,9 +49,9 @@
EXPORT_SYMBOL(serio_interrupt);
EXPORT_SYMBOL(serio_register_port);
-EXPORT_SYMBOL(serio_register_slave_port);
+EXPORT_SYMBOL(__serio_register_port);
EXPORT_SYMBOL(serio_unregister_port);
-EXPORT_SYMBOL(serio_unregister_slave_port);
+EXPORT_SYMBOL(__serio_unregister_port);
EXPORT_SYMBOL(serio_register_device);
EXPORT_SYMBOL(serio_unregister_device);
EXPORT_SYMBOL(serio_open);
@@ -163,17 +163,16 @@
void serio_register_port(struct serio *serio)
{
down(&serio_sem);
- list_add_tail(&serio->node, &serio_list);
- serio_find_dev(serio);
+ __serio_register_port(serio);
up(&serio_sem);
}
/*
- * Same as serio_register_port but does not try to acquire serio_sem.
- * Should be used when registering a serio from other input device's
+ * Should only be called directly if serio_sem has already been taken,
+ * for example when unregistering a serio from other input device's
* connect() function.
*/
-void serio_register_slave_port(struct serio *serio)
+void __serio_register_port(struct serio *serio)
{
list_add_tail(&serio->node, &serio_list);
serio_find_dev(serio);
@@ -182,18 +181,16 @@
void serio_unregister_port(struct serio *serio)
{
down(&serio_sem);
- list_del_init(&serio->node);
- if (serio->dev && serio->dev->disconnect)
- serio->dev->disconnect(serio);
+ __serio_unregister_port(serio);
up(&serio_sem);
}
/*
- * Same as serio_unregister_port but does not try to acquire serio_sem.
- * Should be used when unregistering a serio from other input device's
+ * Should only be called directly if serio_sem has already been taken,
+ * for example when unregistering a serio from other input device's
* disconnect() function.
*/
-void serio_unregister_slave_port(struct serio *serio)
+void __serio_unregister_port(struct serio *serio)
{
list_del_init(&serio->node);
if (serio->dev && serio->dev->disconnect)
diff -Nru a/include/linux/serio.h b/include/linux/serio.h
--- a/include/linux/serio.h Tue Sep 30 01:02:23 2003
+++ b/include/linux/serio.h Tue Sep 30 01:02:23 2003
@@ -65,9 +65,9 @@
irqreturn_t serio_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs);
void serio_register_port(struct serio *serio);
-void serio_register_slave_port(struct serio *serio);
+void __serio_register_port(struct serio *serio);
void serio_unregister_port(struct serio *serio);
-void serio_unregister_slave_port(struct serio *serio);
+void __serio_unregister_port(struct serio *serio);
void serio_register_device(struct serio_dev *dev);
void serio_unregister_device(struct serio_dev *dev);
next prev parent reply other threads:[~2003-09-30 6:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-09-30 6:24 2.6: New set of input patches Dmitry Torokhov
2003-09-30 6:06 ` Dmitry Torokhov [this message]
2003-09-30 6:15 ` [PATCH 2/6] serio: possible race between port removal and kseriod Dmitry Torokhov
2003-09-30 6:15 ` [PATCH 3/6] Add black list to handler<->device matching Dmitry Torokhov
2003-09-30 6:20 ` [PATCH 4/6] Synaptics: code cleanup Dmitry Torokhov
2003-09-30 6:23 ` [PATCH 5/6] serio: reconnect facility Dmitry Torokhov
2003-09-30 6:27 ` [PATCH 6/6] Synaptics: use serio_reconnect Dmitry Torokhov
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=200309300106.20744.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=petero2@telia.com \
--cc=vojtech@suse.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.