All of 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 V7 09/11] USB: f81232: clarify f81232_ioctl() and fix
Date: Tue, 24 Feb 2015 18:16:24 +0800	[thread overview]
Message-ID: <1424772986-5542-10-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
In-Reply-To: <1424772986-5542-1-git-send-email-hpeter+linux_kernel@gmail.com>

We extract TIOCGSERIAL section in f81232_ioctl() to f81232_get_serial_info()
to make it clarify.

Also we fix device type from 16654 to 16550A, and set it's baud_base
to 115200 (1.8432MHz/16).

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

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 0c96b9a..3b0da70 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -603,24 +603,32 @@ static int f81232_carrier_raised(struct usb_serial_port *port)
 	return 0;
 }
 
+static int f81232_get_serial_info(struct usb_serial_port *port,
+		unsigned long arg)
+{
+	struct serial_struct ser;
+
+	memset(&ser, 0, sizeof(ser));
+
+	ser.type = PORT_16550A;
+	ser.line = port->minor;
+	ser.port = port->port_number;
+	ser.baud_base = 115200;
+
+	if (copy_to_user((void __user *)arg, &ser, sizeof(ser)))
+		return -EFAULT;
+
+	return 0;
+}
+
 static int f81232_ioctl(struct tty_struct *tty,
 			unsigned int cmd, unsigned long arg)
 {
-	struct serial_struct ser;
 	struct usb_serial_port *port = tty->driver_data;
 
 	switch (cmd) {
 	case TIOCGSERIAL:
-		memset(&ser, 0, sizeof ser);
-		ser.type = PORT_16654;
-		ser.line = port->minor;
-		ser.port = port->port_number;
-		ser.baud_base = 460800;
-
-		if (copy_to_user((void __user *)arg, &ser, sizeof ser))
-			return -EFAULT;
-
-		return 0;
+		return f81232_get_serial_info(port, arg);
 	default:
 		break;
 	}
-- 
1.9.1


  parent reply	other threads:[~2015-02-24 10:17 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-24 10:16 [PATCH V7 00/11] USB: f81232: V7 patches Peter Hung
2015-02-24 10:16 ` [PATCH V7 01/11] USB: f81232: rename private struct member name Peter Hung
2015-02-24 10:16 ` [PATCH V7 02/11] USB: f81232: add preparatory functions Peter Hung
2015-02-25  6:30   ` Johan Hovold
2015-02-24 10:16 ` [PATCH V7 03/11] USB: f81232: implement RX bulk-in EP Peter Hung
2015-02-25  6:40   ` Johan Hovold
2015-02-24 10:16 ` [PATCH V7 04/11] USB: f81232: change lock mechanism Peter Hung
2015-02-24 10:16 ` [PATCH V7 05/11] USB: f81232: implement read IIR/MSR with endpoint Peter Hung
2015-02-25  6:53   ` Johan Hovold
2015-02-24 10:16 ` [PATCH V7 06/11] USB: f81232: implement MCR/MSR function Peter Hung
2015-02-25  7:02   ` Johan Hovold
2015-02-24 10:16 ` [PATCH V7 07/11] USB: f81232: implement port_enable function Peter Hung
2015-02-25  7:11   ` Johan Hovold
2015-02-24 10:16 ` [PATCH V7 08/11] USB: f81232: implement set_termios() Peter Hung
2015-02-25  7:52   ` Johan Hovold
2015-02-24 10:16 ` Peter Hung [this message]
2015-02-24 10:16 ` [PATCH V7 10/11] USB: f81232: cleanup non-used define Peter Hung
2015-02-24 10:16 ` [PATCH V7 11/11] USB: f81232: modify/add author Peter Hung

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=1424772986-5542-10-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 \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.