diff options
| author | Richard Weinberger <richard@nod.at> | 2012-06-04 21:58:39 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-07-28 17:47:59 +0200 |
| commit | a84ccab132370a07c7ca0c6df8c96bbd16306c9a (patch) | |
| tree | 34492732bdae70e16ac71945ada5bae1700f0bc3 /arch/um | |
| parent | 79e0273d187c807dfec8d0cf450b8187cab5d3af (diff) | |
| download | linux-a84ccab132370a07c7ca0c6df8c96bbd16306c9a.tar.gz linux-a84ccab132370a07c7ca0c6df8c96bbd16306c9a.tar.bz2 linux-a84ccab132370a07c7ca0c6df8c96bbd16306c9a.zip | |
um: remove count_lock
this lock is no longer needed.
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/line.c | 6 | ||||
| -rw-r--r-- | arch/um/drivers/line.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 95d5e7803bc7..555ccfc7300c 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -382,8 +382,6 @@ int setup_one_line(struct line *lines, int n, char *init, struct tty_driver *driver = line->driver->driver; int err = -EINVAL; - mutex_lock(&line->count_lock); - if (line->port.count) { *error_out = "Device is already open"; goto out; @@ -425,7 +423,6 @@ int setup_one_line(struct line *lines, int n, char *init, } } out: - mutex_unlock(&line->count_lock); return err; } @@ -513,7 +510,6 @@ int line_get_config(char *name, struct line *lines, unsigned int num, char *str, line = &lines[dev]; - mutex_lock(&line->count_lock); if (!line->valid) CONFIG_CHUNK(str, size, n, "none", 1); else { @@ -525,7 +521,6 @@ int line_get_config(char *name, struct line *lines, unsigned int num, char *str, tty_kref_put(tty); } } - mutex_unlock(&line->count_lock); return n; } @@ -578,7 +573,6 @@ int register_lines(struct line_driver *line_driver, tty_port_init(&lines[i].port); lines[i].port.ops = &line_port_ops; spin_lock_init(&lines[i].lock); - mutex_init(&lines[i].count_lock); lines[i].driver = line_driver; INIT_LIST_HEAD(&lines[i].chan_list); } diff --git a/arch/um/drivers/line.h b/arch/um/drivers/line.h index ad00f3e11ecc..bae95611e7ab 100644 --- a/arch/um/drivers/line.h +++ b/arch/um/drivers/line.h @@ -33,7 +33,6 @@ struct line_driver { struct line { struct tty_port port; - struct mutex count_lock; int valid; char *init_str; |