From: Jiri Slaby <jslaby@suse.cz>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH 35/70] mxser: drop mxser_port::baud_base
Date: Fri, 18 Jun 2021 08:14:41 +0200 [thread overview]
Message-ID: <20210618061516.662-36-jslaby@suse.cz> (raw)
In-Reply-To: <20210618061516.662-1-jslaby@suse.cz>
It's an once-set constant, so define a macro for the constant
(MXSER_BAUD_BASE) and use it in the code instead.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/mxser.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index b47b17ec1f12..204b71c4d1ae 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -156,6 +156,8 @@
#define WAKEUP_CHARS 256
+#define MXSER_BAUD_BASE 921600
+
#define PCI_DEVICE_ID_POS104UL 0x1044
#define PCI_DEVICE_ID_CB108 0x1080
#define PCI_DEVICE_ID_CP102UF 0x1023
@@ -274,7 +276,6 @@ struct mxser_port {
u8 rx_high_water;
u8 rx_low_water;
- int baud_base; /* max. speed */
int type; /* UART type */
unsigned char x_char; /* xon/xoff character */
@@ -584,13 +585,13 @@ static int mxser_set_baud(struct tty_struct *tty, speed_t newspd)
return -1;
if (newspd == 134) {
- quot = 2 * info->baud_base / 269;
+ quot = 2 * MXSER_BAUD_BASE / 269;
tty_encode_baud_rate(tty, 134, 134);
} else if (newspd) {
- quot = info->baud_base / newspd;
+ quot = MXSER_BAUD_BASE / newspd;
if (quot == 0)
quot = 1;
- baud = info->baud_base/quot;
+ baud = MXSER_BAUD_BASE / quot;
tty_encode_baud_rate(tty, baud, baud);
} else {
quot = 0;
@@ -601,7 +602,7 @@ static int mxser_set_baud(struct tty_struct *tty, speed_t newspd)
* u64 domain
*/
timeout = (u64)info->xmit_fifo_size * HZ * 10 * quot;
- do_div(timeout, info->baud_base);
+ do_div(timeout, MXSER_BAUD_BASE);
info->timeout = timeout + HZ / 50; /* Add .02 seconds of slop */
if (quot) {
@@ -623,7 +624,7 @@ static int mxser_set_baud(struct tty_struct *tty, speed_t newspd)
#ifdef BOTHER
if (C_BAUD(tty) == BOTHER) {
- quot = info->baud_base % newspd;
+ quot = MXSER_BAUD_BASE % newspd;
quot *= 8;
if (quot % newspd > newspd / 2) {
quot /= newspd;
@@ -1222,7 +1223,7 @@ static int mxser_get_serial_info(struct tty_struct *tty,
ss->port = info->ioaddr,
ss->irq = info->board->irq,
ss->flags = info->port.flags,
- ss->baud_base = info->baud_base,
+ ss->baud_base = MXSER_BAUD_BASE,
ss->close_delay = close_delay;
ss->closing_wait = closing_wait;
ss->custom_divisor = info->custom_divisor,
@@ -1263,7 +1264,7 @@ static int mxser_set_serial_info(struct tty_struct *tty,
closing_wait = msecs_to_jiffies(closing_wait * 10);
if (!capable(CAP_SYS_ADMIN)) {
- if ((ss->baud_base != info->baud_base) ||
+ if ((ss->baud_base != MXSER_BAUD_BASE) ||
(close_delay != info->port.close_delay) ||
(closing_wait != info->port.closing_wait) ||
((ss->flags & ~ASYNC_USR_MASK) != (info->port.flags & ~ASYNC_USR_MASK))) {
@@ -1282,7 +1283,7 @@ static int mxser_set_serial_info(struct tty_struct *tty,
port->close_delay = close_delay;
port->closing_wait = closing_wait;
if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST &&
- (ss->baud_base != info->baud_base ||
+ (ss->baud_base != MXSER_BAUD_BASE ||
ss->custom_divisor !=
info->custom_divisor)) {
if (ss->custom_divisor == 0) {
@@ -2018,7 +2019,7 @@ static int mxser_initbrd(struct mxser_board *brd)
process_txrx_fifo(info);
- info->custom_divisor = info->baud_base * 16;
+ info->custom_divisor = MXSER_BAUD_BASE * 16;
info->port.close_delay = 5 * HZ / 10;
info->port.closing_wait = 30 * HZ;
spin_lock_init(&info->slock);
@@ -2127,10 +2128,6 @@ static int mxser_probe(struct pci_dev *pdev,
outb(0, ioaddress + 0x0c); /* default set to RS232 mode */
}
- for (i = 0; i < brd->info->nports; i++) {
- brd->ports[i].baud_base = 921600;
- }
-
/* mxser_initbrd will hook ISR. */
retval = mxser_initbrd(brd);
if (retval)
--
2.32.0
next prev parent reply other threads:[~2021-06-18 6:17 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 6:14 [PATCH 00/69] mxser: cleanup Jiri Slaby
2021-06-18 6:14 ` [PATCH 01/70] mxser: drop ISA support Jiri Slaby
2021-06-18 6:14 ` [PATCH 02/70] mxser: renumber mxser_cards Jiri Slaby
2021-06-18 6:14 ` [PATCH 03/70] mxser: remove info printout from init Jiri Slaby
2021-06-18 6:14 ` [PATCH 04/70] mxser: integrate mxser.h into .c Jiri Slaby
2021-06-18 6:14 ` [PATCH 05/70] mxser: cleanup Gpci_uart_info struct Jiri Slaby
2021-06-18 6:14 ` [PATCH 06/70] mxser: rename CheckIsMoxaMust to mxser_get_must_hwid Jiri Slaby
2021-06-18 6:14 ` [PATCH 07/70] mxser: rename mxser_board::chip_flag to must_hwid Jiri Slaby
2021-06-18 6:14 ` [PATCH 08/70] mxser: introduce enum mxser_must_hwid Jiri Slaby
2021-06-18 6:14 ` [PATCH 09/70] mxser: drop constant board::uart_type Jiri Slaby
2021-06-18 6:14 ` [PATCH 10/70] mxser: move max_baud from port to board Jiri Slaby
2021-06-18 6:14 ` [PATCH 11/70] mxser: remove nonsense from ISR Jiri Slaby
2021-06-18 6:14 ` [PATCH 12/70] mxser: cleanup LSR handling in mxser_receive_chars Jiri Slaby
2021-06-18 6:14 ` [PATCH 13/70] mxser: extract port ISR Jiri Slaby
2021-06-18 6:14 ` [PATCH 14/70] mxser: simplify mxser_interrupt and drop mxser_board::vector_mask Jiri Slaby
2021-06-18 6:14 ` [PATCH 15/70] mxser: extract mxser_receive_chars_new Jiri Slaby
2021-06-18 6:14 ` [PATCH 16/70] mxser: extract mxser_receive_chars_old Jiri Slaby
2021-06-18 6:14 ` [PATCH 17/70] mxser: remove else from LSR bits checks Jiri Slaby
2021-06-18 6:14 ` [PATCH 18/70] mxser: correct types for uart variables Jiri Slaby
2021-06-18 6:14 ` [PATCH 19/70] mxser: make xmit ring buffer variables unsigned Jiri Slaby
2021-06-18 6:14 ` [PATCH 20/70] mxser: drop UART_MCR_AFE and UART_LSR_SPECIAL defines Jiri Slaby
2021-06-18 6:14 ` [PATCH 21/70] mxser: drop unused MOXA_DIAGNOSE macro Jiri Slaby
2021-06-18 6:14 ` [PATCH 22/70] mxser: remove MOXA_GET_MAJOR deprecated ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 23/70] mxser: remove MOXA_SET_BAUD_METHOD ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 24/70] mxser: remove MOXA_ASPP_MON and friends Jiri Slaby
2021-06-18 6:14 ` [PATCH 25/70] mxser: remove MOXA_ASPP_LSTATUS ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 26/70] mxser: remove MOXA_CHKPORTENABLE ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 27/70] mxser: remove MOXA_GETDATACOUNT ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 28/70] mxser: remove MOXA_GETMSTATUS ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 29/70] mxser: remove MOXA_ASPP_OQUEUE ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 30/70] mxser: remove MOXA_HighSpeedOn ioctl Jiri Slaby
2021-06-18 6:14 ` [PATCH 31/70] mxser: remove cnt from mxser_receive_chars Jiri Slaby
2021-06-18 6:14 ` [PATCH 32/70] mxser: don't allocate MXSER_PORTS + 1 Jiri Slaby
2021-06-18 6:14 ` [PATCH 33/70] mxser: drop unused mxser_port::normal_termios Jiri Slaby
2021-06-18 6:14 ` [PATCH 34/70] mxser: remove unused mxser_port::stop_rx Jiri Slaby
2021-06-18 6:14 ` Jiri Slaby [this message]
2021-06-18 6:14 ` [PATCH 36/70] mxser: drop mxser_port::custom_divisor Jiri Slaby
2021-06-18 6:14 ` [PATCH 37/70] mxser: cleanup mxser_change_speed Jiri Slaby
2021-06-18 6:14 ` [PATCH 38/70] mxser: extract mxser_ioctl_op_mode Jiri Slaby
2021-06-18 6:14 ` [PATCH 39/70] mxser: simplify mxser_ioctl_op_mode Jiri Slaby
2021-06-18 6:14 ` [PATCH 40/70] mxser: dedup mxser_must_set_enhance_mode Jiri Slaby
2021-06-18 6:14 ` [PATCH 41/70] mxser: introduce mxser_must_select_bank and use it Jiri Slaby
2021-06-18 6:14 ` [PATCH 42/70] mxser: clean up the rest of MUST helpers Jiri Slaby
2021-06-18 6:14 ` [PATCH 43/70] mxser: move board init into mxser_initbrd Jiri Slaby
2021-06-18 6:14 ` [PATCH 44/70] mxser: inline mxser_board_remove into mxser_remove Jiri Slaby
2021-06-18 6:14 ` [PATCH 45/70] mxser: pci, switch to managed resources Jiri Slaby
2021-06-18 6:14 ` [PATCH 46/70] mxser: move request irq to probe and switch to managed Jiri Slaby
2021-06-18 6:14 ` [PATCH 47/70] mxser: remove info message from probe Jiri Slaby
2021-06-18 6:14 ` [PATCH 48/70] mxser: remove mxser_cardinfo Jiri Slaby
2021-06-18 6:14 ` [PATCH 49/70] mxser: cleanup mxser_process_txrx_fifo Jiri Slaby
2021-06-18 6:14 ` [PATCH 50/70] mxser: rework and simplify mxser_open Jiri Slaby
2021-06-18 6:14 ` [PATCH 51/70] mxser: make mxser_board::idx really an index Jiri Slaby
2021-06-18 6:14 ` [PATCH 52/70] mxser: alloc struct mxser_board dynamically Jiri Slaby
2021-06-18 6:14 ` [PATCH 53/70] mxser: alloc only needed # of ports Jiri Slaby
2021-06-18 6:15 ` [PATCH 54/70] mxser: remove pointless ioaddr checks Jiri Slaby
2021-06-18 6:15 ` [PATCH 55/70] mxser: cleanup mxser_rs_break Jiri Slaby
2021-06-18 6:15 ` [PATCH 56/70] mxser: cleanup mxser_dtr_rts Jiri Slaby
2021-06-18 6:15 ` [PATCH 57/70] mxser: don't start TX from tty_operations::put_char Jiri Slaby
2021-06-18 6:15 ` [PATCH 58/70] mxser: extract and dedup CTS handling Jiri Slaby
2021-06-18 6:15 ` [PATCH 59/70] mxser: introduce and use start/stop_tx helpers Jiri Slaby
2021-06-18 6:15 ` [PATCH 60/70] mxser: remove xmit_cnt < 0 tests Jiri Slaby
2021-06-18 6:15 ` [PATCH 61/70] mxser: decrypt FCR values Jiri Slaby
2021-06-18 6:15 ` [PATCH 62/70] mxser: fix typos around enhanced mode Jiri Slaby
2021-06-18 6:15 ` [PATCH 63/70] mxser: access info->MCR under info->slock Jiri Slaby
2021-06-18 6:15 ` [PATCH 64/70] mxser: use port variable in mxser_set_serial_info Jiri Slaby
2021-06-18 6:15 ` [PATCH 65/70] mxser: rename flags to old_speed " Jiri Slaby
2021-06-18 6:15 ` [PATCH 66/70] mxser: introduce mxser_16550A_or_MUST helper Jiri Slaby
2021-06-18 6:15 ` [PATCH 67/70] mxser: Documentation, remove traces of callout device Jiri Slaby
2021-06-18 6:15 ` [PATCH 68/70] mxser: Documentation, make the docs up-to-date Jiri Slaby
2021-06-18 6:15 ` [PATCH 69/70] mxser: Documentation, fix typos Jiri Slaby
2021-06-18 6:15 ` [PATCH 70/70] MAINTAINERS: add me back as mxser maintainer Jiri Slaby
2021-06-18 11:10 ` [PATCH 00/69] mxser: cleanup Greg KH
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=20210618061516.662-36-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@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).