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 08/10] USB: f81232: clarify f81232_ioctl() and fix
Date: Thu, 26 Feb 2015 18:02:14 +0800	[thread overview]
Message-ID: <1424944936-7117-9-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
In-Reply-To: <1424944936-7117-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 0580195..21f2342 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -596,24 +596,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-26 10:02 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 ` [PATCH V8 03/10] USB: f81232: change lock mechanism Peter Hung
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 ` Peter Hung [this message]
2015-03-14 12:27   ` [PATCH V8 08/10] USB: f81232: clarify f81232_ioctl() and fix 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-9-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 08/10] USB: f81232: clarify f81232_ioctl() and fix' \
    /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).