From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] serport: place serport serio device correctly in the device tree
Date: Sat, 7 Aug 2010 13:55:39 +0400 [thread overview]
Message-ID: <1281174939-6349-1-git-send-email-dbaryshkov@gmail.com> (raw)
In-Reply-To: <20100806165758.GA3364@suse.de>
Make serport serio device to be a child of corresponding tty device
instead of just hanging at /sys/devices/serioX.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/input/serio/serport.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 6d34511..d3d832a 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -148,6 +148,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
{
struct serport *serport = (struct serport*) tty->disc_data;
struct serio *serio;
+ struct device *parent;
char name[64];
if (test_and_set_bit(SERPORT_BUSY, &serport->flags))
@@ -157,6 +158,8 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
if (!serio)
return -ENOMEM;
+ parent = tty_get_device(tty);
+
strlcpy(serio->name, "Serial port", sizeof(serio->name));
snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", tty_name(tty, name));
serio->id = serport->id;
@@ -165,6 +168,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
serio->open = serport_serio_open;
serio->close = serport_serio_close;
serio->port_data = serport;
+ serio->dev.parent = parent;
serio_register_port(serport->serio);
printk(KERN_INFO "serio: Serial port %s\n", tty_name(tty, name));
@@ -173,6 +177,8 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
serio_unregister_port(serport->serio);
serport->serio = NULL;
+ put_device(parent);
+
clear_bit(SERPORT_DEAD, &serport->flags);
clear_bit(SERPORT_BUSY, &serport->flags);
--
1.7.1
next prev parent reply other threads:[~2010-08-07 9:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-06 16:29 [PATCH 1/2] tty_io: add an API to get device corresponding to tty_struct Dmitry Eremin-Solenikov
2010-08-06 16:29 ` [PATCH 2/2] serport: place serport serio device correctly in the device tree Dmitry Eremin-Solenikov
2010-08-06 16:57 ` Greg KH
2010-08-07 9:55 ` Dmitry Eremin-Solenikov [this message]
2010-08-06 16:58 ` [PATCH 1/2] tty_io: add an API to get device corresponding to tty_struct Greg KH
2010-08-07 9:55 ` Dmitry Eremin-Solenikov
2010-08-07 11:33 ` Alan Cox
2010-08-08 0:38 ` Dmitry Eremin-Solenikov
2010-08-08 12:56 ` Alan Cox
2010-08-09 14:22 [PATCH 1/2] tty: add tty_struct->dev pointer to corresponding device instance Dmitry Eremin-Solenikov
2010-08-09 14:22 ` [PATCH 2/2] serport: place serport serio device correctly in the device tree Dmitry Eremin-Solenikov
2010-08-11 3:27 ` 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=1281174939-6349-1-git-send-email-dbaryshkov@gmail.com \
--to=dbaryshkov@gmail.com \
--cc=gregkh@suse.de \
--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;
as well as URLs for NNTP newsgroup(s).