Commit 30004ac9 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Greg Kroah-Hartman

tty: add tty_struct->dev pointer to corresponding device instance

Some device drivers (mostly tty line disciplines) would like to have way
know a struct device instance corresponding to passed tty_struct. Add
a struct device pointer to struct tty_struct and populate it during
initialize_tty_struct().
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f6f94e2a
...@@ -183,6 +183,8 @@ struct tty_struct *alloc_tty_struct(void) ...@@ -183,6 +183,8 @@ struct tty_struct *alloc_tty_struct(void)
void free_tty_struct(struct tty_struct *tty) void free_tty_struct(struct tty_struct *tty)
{ {
if (tty->dev)
put_device(tty->dev);
kfree(tty->write_buf); kfree(tty->write_buf);
tty_buffer_free_all(tty); tty_buffer_free_all(tty);
kfree(tty); kfree(tty);
...@@ -2783,6 +2785,20 @@ void do_SAK(struct tty_struct *tty) ...@@ -2783,6 +2785,20 @@ void do_SAK(struct tty_struct *tty)
EXPORT_SYMBOL(do_SAK); EXPORT_SYMBOL(do_SAK);
static int dev_match_devt(struct device *dev, void *data)
{
dev_t *devt = data;
return dev->devt == *devt;
}
/* Must put_device() after it's unused! */
static struct device *tty_get_device(struct tty_struct *tty)
{
dev_t devt = tty_devnum(tty);
return class_find_device(tty_class, NULL, &devt, dev_match_devt);
}
/** /**
* initialize_tty_struct * initialize_tty_struct
* @tty: tty to initialize * @tty: tty to initialize
...@@ -2823,6 +2839,7 @@ void initialize_tty_struct(struct tty_struct *tty, ...@@ -2823,6 +2839,7 @@ void initialize_tty_struct(struct tty_struct *tty,
tty->ops = driver->ops; tty->ops = driver->ops;
tty->index = idx; tty->index = idx;
tty_line_name(driver, idx, tty->name); tty_line_name(driver, idx, tty->name);
tty->dev = tty_get_device(tty);
} }
/** /**
......
...@@ -256,6 +256,7 @@ struct tty_operations; ...@@ -256,6 +256,7 @@ struct tty_operations;
struct tty_struct { struct tty_struct {
int magic; int magic;
struct kref kref; struct kref kref;
struct device *dev;
struct tty_driver *driver; struct tty_driver *driver;
const struct tty_operations *ops; const struct tty_operations *ops;
int index; int index;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment