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,
Peter Hung <hpeter+linux_kernel@gmail.com>
Subject: [PATCH V5 6/8] USB: f81232: clarify f81232_ioctl()
Date: Fri, 6 Feb 2015 17:46:52 +0800 [thread overview]
Message-ID: <1423216014-571-7-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
In-Reply-To: <1423216014-571-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
The f81232_set_mctrl() replace set_control_lines() to do MCR control
so we clean-up the set_control_lines() function.
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
drivers/usb/serial/f81232.c | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index e1cdf42..4dddb44 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -516,24 +516,36 @@ 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.flags = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
+ ser.xmit_fifo_size = port->bulk_out_size;
+ ser.close_delay = 5 * HZ;
+ ser.closing_wait = 30 * HZ;
+ 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
next prev parent reply other threads:[~2015-02-06 9:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-06 9:46 [PATCH V5 0/8] USB: f81534: v5 patch Peter Hung
2015-02-06 9:46 ` [PATCH V5 1/8] USB: f81232: Rename private struct member name Peter Hung
2015-02-06 9:46 ` [PATCH V5 2/8] USB: f81232: implement read IIR/MSR with endpoint Peter Hung
2015-02-06 9:46 ` [PATCH V5 3/8] USB: f81232: implement RX bulk-in ep Peter Hung
2015-02-16 12:59 ` Johan Hovold
2015-02-16 13:02 ` Johan Hovold
2015-02-06 9:46 ` [PATCH V5 4/8] USB: f81232: implement set_termios Peter Hung
2015-02-06 9:46 ` [PATCH V5 5/8] USB: f81232: implement MCR/MSR function Peter Hung
2015-02-06 9:46 ` Peter Hung [this message]
2015-02-06 12:21 ` [PATCH V5 6/8] USB: f81232: clarify f81232_ioctl() Sergei Shtylyov
2015-02-09 6:59 ` Peter Hung
2015-02-09 8:42 ` Johan Hovold
2015-02-10 2:35 ` Peter Hung
2015-02-06 9:46 ` [PATCH V5 7/8] USB: f81232: fix error in f81232_carrier_raised() Peter Hung
2015-02-06 9:46 ` [PATCH V5 8/8] 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=1423216014-571-7-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome