Skip to content

Commit

Permalink
um: remove count_lock
Browse files Browse the repository at this point in the history
this lock is no longer needed.

Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
richardweinberger committed Jul 28, 2012
1 parent 79e0273 commit a84ccab
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
6 changes: 0 additions & 6 deletions arch/um/drivers/line.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -425,7 +423,6 @@ int setup_one_line(struct line *lines, int n, char *init,
}
}
out:
mutex_unlock(&line->count_lock);
return err;
}

Expand Down Expand Up @@ -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 {
Expand All @@ -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;
}
Expand Down Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion arch/um/drivers/line.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct line_driver {

struct line {
struct tty_port port;
struct mutex count_lock;
int valid;

char *init_str;
Expand Down

0 comments on commit a84ccab

Please sign in to comment.