From: "Pali Rohár" <pali@kernel.org>
To: "Johan Hovold" <johan@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Marek Behún" <kabel@kernel.org>
Cc: linux-usb@vger.kernel.org
Subject: [PATCH v3 3/7] USB: serial: ftdi_sio: Extract SIO divisor code to function
Date: Sat, 24 Sep 2022 12:27:14 +0200 [thread overview]
Message-ID: <20220924102718.2984-4-pali@kernel.org> (raw)
In-Reply-To: <20220924102718.2984-1-pali@kernel.org>
In preparation for following changes, extract divisor code for SIO chip
into new function ftdi_sio_baud_to_divisor(), as is done for other
chips.
No functional change.
Signed-off-by: Pali Rohár <pali@kernel.org>
Tested-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/usb/serial/ftdi_sio.c | 45 ++++++++++++++++++++++++-----------
1 file changed, 31 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index bfa601fc14fe..fe8a7c5fa0e9 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1155,6 +1155,34 @@ static struct usb_serial_driver * const serial_drivers[] = {
* ***************************************************************************
*/
+static u32 ftdi_sio_baud_to_divisor(int baud)
+{
+ switch (baud) {
+ case 300:
+ return ftdi_sio_b300;
+ case 600:
+ return ftdi_sio_b600;
+ case 1200:
+ return ftdi_sio_b1200;
+ case 2400:
+ return ftdi_sio_b2400;
+ case 4800:
+ return ftdi_sio_b4800;
+ case 9600:
+ return ftdi_sio_b9600;
+ case 19200:
+ return ftdi_sio_b19200;
+ case 38400:
+ return ftdi_sio_b38400;
+ case 57600:
+ return ftdi_sio_b57600;
+ case 115200:
+ return ftdi_sio_b115200;
+ default:
+ return -1;
+ }
+}
+
static unsigned short int ftdi_232am_baud_base_to_divisor(int baud, int base)
{
unsigned short int divisor;
@@ -1314,23 +1342,12 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
baud = 9600;
switch (priv->chip_type) {
case SIO: /* SIO chip */
- switch (baud) {
- case 300: div_value = ftdi_sio_b300; break;
- case 600: div_value = ftdi_sio_b600; break;
- case 1200: div_value = ftdi_sio_b1200; break;
- case 2400: div_value = ftdi_sio_b2400; break;
- case 4800: div_value = ftdi_sio_b4800; break;
- case 9600: div_value = ftdi_sio_b9600; break;
- case 19200: div_value = ftdi_sio_b19200; break;
- case 38400: div_value = ftdi_sio_b38400; break;
- case 57600: div_value = ftdi_sio_b57600; break;
- case 115200: div_value = ftdi_sio_b115200; break;
- } /* baud */
- if (div_value == 0) {
+ div_value = ftdi_sio_baud_to_divisor(baud);
+ if (div_value == (u32)-1) {
dev_dbg(dev, "%s - Baudrate (%d) requested is not supported\n",
__func__, baud);
- div_value = ftdi_sio_b9600;
baud = 9600;
+ div_value = ftdi_sio_baud_to_divisor(baud);
div_okay = 0;
}
break;
--
2.20.1
next prev parent reply other threads:[~2022-09-24 10:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-24 10:27 [PATCH v3 0/7] ftdi_sio driver improvements Pali Rohár
2022-09-24 10:27 ` [PATCH v3 1/7] USB: serial: ftdi_sio: Fix divisor overflow Pali Rohár
2022-11-28 14:54 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 2/7] USB: serial: ftdi_sio: Add missing baud rate validation Pali Rohár
2022-11-28 15:00 ` Johan Hovold
2022-09-24 10:27 ` Pali Rohár [this message]
2022-09-24 10:47 ` [PATCH v3 3/7] USB: serial: ftdi_sio: Extract SIO divisor code to function Greg Kroah-Hartman
2022-10-09 12:17 ` Pali Rohár
2022-11-01 22:50 ` Pali Rohár
2022-11-02 1:47 ` Greg Kroah-Hartman
2022-11-26 16:29 ` Pali Rohár
2022-11-02 7:34 ` Johan Hovold
2022-11-28 15:10 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 4/7] USB: serial: ftdi_sio: Do not reset baud rate to 9600 Baud on error Pali Rohár
2022-11-28 16:37 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 5/7] USB: serial: ftdi_sio: Fix baud rate rounding for ASYNC_SPD_CUST Pali Rohár
2022-11-28 16:57 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 6/7] USB: serial: ftdi_sio: Fix custom_divisor for TIOCGSERIAL and c_*speed for TCGETS2 Pali Rohár
2022-11-28 17:05 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 7/7] USB: serial: ftdi_sio: Fill c_*speed fields with real baud rate Pali Rohár
2022-11-28 17:16 ` 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=20220924102718.2984-4-pali@kernel.org \
--to=pali@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=kabel@kernel.org \
--cc=linux-usb@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).