linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alan Cox <alan@linux.intel.com>
To: greg@kroah.com, linux-serial@vger.kernel.org
Subject: [PATCH 10/11] specialix; Kill the BKL
Date: Wed, 19 May 2010 13:03:25 +0100	[thread overview]
Message-ID: <20100519120324.16717.99272.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100519120111.16717.71992.stgit@localhost.localdomain>

Use the port mutex instead

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

 drivers/char/specialix.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)


diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 2c24fcd..7be456f 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -1863,8 +1863,7 @@ static int sx_set_serial_info(struct specialix_port *port,
 		return -EFAULT;
 	}
 
-	lock_kernel();
-
+	mutex_lock(&port->port.mutex);
 	change_speed = ((port->port.flags & ASYNC_SPD_MASK) !=
 			(tmp.flags & ASYNC_SPD_MASK));
 	change_speed |= (tmp.custom_divisor != port->custom_divisor);
@@ -1875,7 +1874,7 @@ static int sx_set_serial_info(struct specialix_port *port,
 		    ((tmp.flags & ~ASYNC_USR_MASK) !=
 		     (port->port.flags & ~ASYNC_USR_MASK))) {
 			func_exit();
-			unlock_kernel();
+			mutex_unlock(&port->port.mutex);
 			return -EPERM;
 		}
 		port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
@@ -1892,7 +1891,7 @@ static int sx_set_serial_info(struct specialix_port *port,
 		sx_change_speed(bp, port);
 
 	func_exit();
-	unlock_kernel();
+	mutex_unlock(&port->port.mutex);
 	return 0;
 }
 
@@ -1906,7 +1905,7 @@ static int sx_get_serial_info(struct specialix_port *port,
 	func_enter();
 
 	memset(&tmp, 0, sizeof(tmp));
-	lock_kernel();
+	mutex_lock(&port->port.mutex);
 	tmp.type = PORT_CIRRUS;
 	tmp.line = port - sx_port;
 	tmp.port = bp->base;
@@ -1917,7 +1916,7 @@ static int sx_get_serial_info(struct specialix_port *port,
 	tmp.closing_wait = port->port.closing_wait * HZ/100;
 	tmp.custom_divisor =  port->custom_divisor;
 	tmp.xmit_fifo_size = CD186x_NFIFO;
-	unlock_kernel();
+	mutex_unlock(&port->port.mutex);
 	if (copy_to_user(retinfo, &tmp, sizeof(tmp))) {
 		func_exit();
 		return -EFAULT;


  parent reply	other threads:[~2010-05-19 12:45 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-19 12:01 [PATCH 00/11] BKL pruning and serial bug fixing Alan Cox
2010-05-19 12:01 ` [PATCH 01/11] tty: Fix the digi acceleport driver NULL checks Alan Cox
2010-05-19 12:02 ` [PATCH 02/11] stallion: prune lock_kernel calls Alan Cox
2010-05-19 12:02 ` [PATCH 03/11] istallion: use bit ops for the board flags Alan Cox
2010-05-19 12:02 ` [PATCH 04/11] riscom8: kill use of lock_kernel Alan Cox
2010-05-19 12:02 ` [PATCH 05/11] isicom: kill off the BKL Alan Cox
2010-05-19 12:02 ` [PATCH 06/11] rocket: kill BKL Alan Cox
2010-05-19 12:02 ` [PATCH 07/11] synclink: kill the big kernel lock Alan Cox
2010-05-19 12:03 ` [PATCH 08/11] cyclades: Kill off BKL usage Alan Cox
2010-05-19 12:03 ` [PATCH 09/11] epca: Kill the big kernel lock Alan Cox
2010-05-19 12:03 ` Alan Cox [this message]
2010-05-19 12:03 ` [PATCH 11/11] synclink: reworking locking a bit Alan Cox
2010-05-20 17:56 ` [PATCH 00/11] BKL pruning and serial bug fixing Greg KH
2010-05-20 18:06   ` Alan Cox
2010-05-20 19:01     ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100519120324.16717.99272.stgit@localhost.localdomain \
    --to=alan@linux.intel.com \
    --cc=greg@kroah.com \
    --cc=linux-serial@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).