From 3a9952f0bb01caeb3cb39be073ea742e765ed850 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Mon, 4 Jun 2012 21:58:39 +0200
Subject: [PATCH] --- yaml --- r: 321176 b: refs/heads/master c:
 a84ccab132370a07c7ca0c6df8c96bbd16306c9a h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/um/drivers/line.c | 6 ------
 trunk/arch/um/drivers/line.h | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 247210c442b2..5e1afdb00760 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79e0273d187c807dfec8d0cf450b8187cab5d3af
+refs/heads/master: a84ccab132370a07c7ca0c6df8c96bbd16306c9a
diff --git a/trunk/arch/um/drivers/line.c b/trunk/arch/um/drivers/line.c
index 95d5e7803bc7..555ccfc7300c 100644
--- a/trunk/arch/um/drivers/line.c
+++ b/trunk/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/trunk/arch/um/drivers/line.h b/trunk/arch/um/drivers/line.h
index ad00f3e11ecc..bae95611e7ab 100644
--- a/trunk/arch/um/drivers/line.h
+++ b/trunk/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;