LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peter Hung <hpeter@gmail.com>
To: johan@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, tom_tsai@fintek.com.tw,
	peter_hong@fintek.com.tw, hpeter@gmail.com,
	Peter Hung <hpeter+linux_kernel@gmail.com>
Subject: [PATCH V8 03/10] USB: f81232: change lock mechanism
Date: Thu, 26 Feb 2015 18:02:09 +0800	[thread overview]
Message-ID: <1424944936-7117-4-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
In-Reply-To: <1424944936-7117-1-git-send-email-hpeter+linux_kernel@gmail.com>

The original driver lock with spin_lock_irqsave()/spin_unlock_irqrestore()
because of it's maybe used in interrupt context f81232_process_read_urb().

We had remove it from previous patch "implement RX bulk-in EP", so we can
change it from busying loop spin_lock to sleepable mutex_lock.

Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
 drivers/usb/serial/f81232.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 25b1a47..cf5b902 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -19,7 +19,7 @@
 #include <linux/serial.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/spinlock.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
@@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
 #define UART_CTS			0x80
 
 struct f81232_private {
-	spinlock_t lock;
+	struct mutex lock;
 	u8 line_control;
 	u8 modem_status;
 };
@@ -227,17 +227,16 @@ static void f81232_close(struct usb_serial_port *port)
 static void f81232_dtr_rts(struct usb_serial_port *port, int on)
 {
 	struct f81232_private *priv = usb_get_serial_port_data(port);
-	unsigned long flags;
 	u8 control;
 
-	spin_lock_irqsave(&priv->lock, flags);
+	mutex_lock(&priv->lock);
 	/* Change DTR and RTS */
 	if (on)
 		priv->line_control |= (CONTROL_DTR | CONTROL_RTS);
 	else
 		priv->line_control &= ~(CONTROL_DTR | CONTROL_RTS);
 	control = priv->line_control;
-	spin_unlock_irqrestore(&priv->lock, flags);
+	mutex_unlock(&priv->lock);
 	set_control_lines(port->serial->dev, control);
 }
 
@@ -281,7 +280,7 @@ static int f81232_port_probe(struct usb_serial_port *port)
 	if (!priv)
 		return -ENOMEM;
 
-	spin_lock_init(&priv->lock);
+	mutex_init(&priv->lock);
 
 	usb_set_serial_port_data(port, priv);
 
-- 
1.9.1


  parent reply	other threads:[~2015-02-26 10:05 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-26 10:02 [PATCH V8 00/10] USB: f81232: V8 patches Peter Hung
2015-02-26 10:02 ` [PATCH V8 01/10] USB: f81232: rename private struct member name Peter Hung
2015-02-26 10:02 ` [PATCH V8 02/10] USB: f81232: implement RX bulk-in EP Peter Hung
2015-03-14 11:48   ` Johan Hovold
2015-03-16  2:53     ` Peter Hung
2015-03-16  8:52       ` Johan Hovold
2015-03-16  9:15         ` Peter Hung
2015-02-26 10:02 ` Peter Hung [this message]
2015-02-26 10:02 ` [PATCH V8 04/10] USB: f81232: implement read IIR/MSR with endpoint Peter Hung
2015-03-14 12:02   ` Johan Hovold
2015-03-16  3:08     ` Peter Hung
2015-03-16  8:55       ` Johan Hovold
2015-03-16  9:18         ` Peter Hung
2015-02-26 10:02 ` [PATCH V8 05/10] USB: f81232: implement MCR/MSR function Peter Hung
2015-03-14 12:09   ` Johan Hovold
2015-02-26 10:02 ` [PATCH V8 06/10] USB: f81232: implement port enable/disable method Peter Hung
2015-02-26 10:02 ` [PATCH V8 07/10] USB: f81232: implement set_termios() Peter Hung
2015-03-14 12:24   ` Johan Hovold
2015-02-26 10:02 ` [PATCH V8 08/10] USB: f81232: clarify f81232_ioctl() and fix Peter Hung
2015-03-14 12:27   ` Johan Hovold
2015-02-26 10:02 ` [PATCH V8 09/10] USB: f81232: cleanup non-used define Peter Hung
2015-02-26 10:02 ` [PATCH V8 10/10] USB: f81232: modify/add author Peter Hung
2015-03-05  5:59 ` [PATCH V8 00/10] USB: f81232: V8 patches Peter Hung
2015-03-05  7:03   ` Johan Hovold
2015-03-14 12:30     ` Johan Hovold

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=1424944936-7117-4-git-send-email-hpeter+linux_kernel@gmail.com \
    --to=hpeter@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hpeter+linux_kernel@gmail.com \
    --cc=johan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=peter_hong@fintek.com.tw \
    --cc=tom_tsai@fintek.com.tw \
    --subject='Re: [PATCH V8 03/10] USB: f81232: change lock mechanism' \
    /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

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).