TTY: crisv10, remove unused tmp_buf

This used to be a helper buffer for generic_serial. generic_serial is gone, tmp_buf shall be removed. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Mikael Starvik <starvik@axis.com> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: linux-cris-kernel@axis.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

TTY: crisv10, remove unused tmp_buf
This used to be a helper buffer for generic_serial. generic_serial is gone, tmp_buf shall be removed. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Mikael Starvik <starvik@axis.com> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: linux-cris-kernel@axis.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jiri Slaby · Greg Kroah-Hartman
1 parent 0034102808
Showing 1 changed file with 1 additions and 26 deletions Side-by-side Diff
drivers/tty/serial/crisv10.c
@@ -952,19 +952,6 @@
 /* Input */
 #define E100_DSR_GET(info) ((*e100_modem_pins[(info)->line].dsr_port) & e100_modem_pins[(info)->line].dsr_mask)
  
-
-/*
- * tmp_buf is used as a temporary buffer by serial_write.  We need to
- * lock it in case the memcpy_fromfs blocks while swapping in a page,
- * and some other program tries to do a serial write at the same time.
- * Since the lock will only come under contention when the system is
- * swapping and available memory is low, it makes sense to share one
- * buffer across all the serial ports, since it significantly saves
- * memory if large numbers of serial ports are open.
- */
-static unsigned char *tmp_buf;
-static DEFINE_MUTEX(tmp_buf_mutex);
-
 /* Calculate the chartime depending on baudrate, numbor of bits etc. */
 static void update_char_time(struct e100_serial * info)
 {
@@ -3150,7 +3137,7 @@
  
 	/* first some sanity checks */
  
-	if (!tty || !info->xmit.buf || !tmp_buf)
+	if (!tty || !info->xmit.buf)
 		return 0;
  
 #ifdef SERIAL_DEBUG_DATA
@@ -4106,7 +4093,6 @@
 {
 	struct e100_serial	*info;
 	int 			retval;
-	unsigned long           page;
 	int                     allocated_resources = 0;
  
 	info = rs_table + tty->index;
@@ -4123,17 +4109,6 @@
 	info->port.tty = tty;
  
 	tty->low_latency = !!(info->flags & ASYNC_LOW_LATENCY);
-
-	if (!tmp_buf) {
-		page = get_zeroed_page(GFP_KERNEL);
-		if (!page) {
-			return -ENOMEM;
-		}
-		if (tmp_buf)
-			free_page(page);
-		else
-			tmp_buf = (unsigned char *) page;
-	}
  
 	/*
 	 * If the port is in the middle of closing, bail out now
...	...	@@ -952,19 +952,6 @@
952	952	/* Input */
953	953	#define E100_DSR_GET(info) ((*e100_modem_pins[(info)->line].dsr_port) & e100_modem_pins[(info)->line].dsr_mask)
954	954
955		-
956		-/*
957		- * tmp_buf is used as a temporary buffer by serial_write. We need to
958		- * lock it in case the memcpy_fromfs blocks while swapping in a page,
959		- * and some other program tries to do a serial write at the same time.
960		- * Since the lock will only come under contention when the system is
961		- * swapping and available memory is low, it makes sense to share one
962		- * buffer across all the serial ports, since it significantly saves
963		- * memory if large numbers of serial ports are open.
964		- */
965		-static unsigned char *tmp_buf;
966		-static DEFINE_MUTEX(tmp_buf_mutex);
967		-
968	955	/* Calculate the chartime depending on baudrate, numbor of bits etc. */
969	956	static void update_char_time(struct e100_serial * info)
970	957	{
...	...	@@ -3150,7 +3137,7 @@
3150	3137
3151	3138	/* first some sanity checks */
3152	3139
3153		- if (!tty \|\| !info->xmit.buf \|\| !tmp_buf)
	3140	+ if (!tty \|\| !info->xmit.buf)
3154	3141	return 0;
3155	3142
3156	3143	#ifdef SERIAL_DEBUG_DATA
...	...	@@ -4106,7 +4093,6 @@
4106	4093	{
4107	4094	struct e100_serial *info;
4108	4095	int retval;
4109		- unsigned long page;
4110	4096	int allocated_resources = 0;
4111	4097
4112	4098	info = rs_table + tty->index;
...	...	@@ -4123,17 +4109,6 @@
4123	4109	info->port.tty = tty;
4124	4110
4125	4111	tty->low_latency = !!(info->flags & ASYNC_LOW_LATENCY);
4126		-
4127		- if (!tmp_buf) {
4128		- page = get_zeroed_page(GFP_KERNEL);
4129		- if (!page) {
4130		- return -ENOMEM;
4131		- }
4132		- if (tmp_buf)
4133		- free_page(page);
4134		- else
4135		- tmp_buf = (unsigned char *) page;
4136		- }
4137	4112
4138	4113	/*
4139	4114	* If the port is in the middle of closing, bail out now