um: remove count_lock
this lock is no longer needed. Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
79e0273d18
commit
a84ccab132
2 changed files with 0 additions and 7 deletions
|
@ -382,8 +382,6 @@ int setup_one_line(struct line *lines, int n, char *init,
|
||||||
struct tty_driver *driver = line->driver->driver;
|
struct tty_driver *driver = line->driver->driver;
|
||||||
int err = -EINVAL;
|
int err = -EINVAL;
|
||||||
|
|
||||||
mutex_lock(&line->count_lock);
|
|
||||||
|
|
||||||
if (line->port.count) {
|
if (line->port.count) {
|
||||||
*error_out = "Device is already open";
|
*error_out = "Device is already open";
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -425,7 +423,6 @@ int setup_one_line(struct line *lines, int n, char *init,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
mutex_unlock(&line->count_lock);
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -513,7 +510,6 @@ int line_get_config(char *name, struct line *lines, unsigned int num, char *str,
|
||||||
|
|
||||||
line = &lines[dev];
|
line = &lines[dev];
|
||||||
|
|
||||||
mutex_lock(&line->count_lock);
|
|
||||||
if (!line->valid)
|
if (!line->valid)
|
||||||
CONFIG_CHUNK(str, size, n, "none", 1);
|
CONFIG_CHUNK(str, size, n, "none", 1);
|
||||||
else {
|
else {
|
||||||
|
@ -525,7 +521,6 @@ int line_get_config(char *name, struct line *lines, unsigned int num, char *str,
|
||||||
tty_kref_put(tty);
|
tty_kref_put(tty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mutex_unlock(&line->count_lock);
|
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
@ -578,7 +573,6 @@ int register_lines(struct line_driver *line_driver,
|
||||||
tty_port_init(&lines[i].port);
|
tty_port_init(&lines[i].port);
|
||||||
lines[i].port.ops = &line_port_ops;
|
lines[i].port.ops = &line_port_ops;
|
||||||
spin_lock_init(&lines[i].lock);
|
spin_lock_init(&lines[i].lock);
|
||||||
mutex_init(&lines[i].count_lock);
|
|
||||||
lines[i].driver = line_driver;
|
lines[i].driver = line_driver;
|
||||||
INIT_LIST_HEAD(&lines[i].chan_list);
|
INIT_LIST_HEAD(&lines[i].chan_list);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ struct line_driver {
|
||||||
|
|
||||||
struct line {
|
struct line {
|
||||||
struct tty_port port;
|
struct tty_port port;
|
||||||
struct mutex count_lock;
|
|
||||||
int valid;
|
int valid;
|
||||||
|
|
||||||
char *init_str;
|
char *init_str;
|
||||||
|
|
Loading…
Reference in a new issue