]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mxser: move max_baud from port to board
authorJiri Slaby <jslaby@suse.cz>
Fri, 18 Jun 2021 06:14:16 +0000 (08:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jun 2021 11:09:58 +0000 (13:09 +0200)
mxser_port::max_baud is actually a board property, not port's. So move
it to mxser_board.

While at it, drop the printk informing about max baud rate during probe.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210618061516.662-11-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/mxser.c

index a6121fea7a556c6102cbf39d05f6b5bb652c4cc8..db594a64ff004958a561c3c936547e56e2f3abfa 100644 (file)
@@ -329,7 +329,6 @@ struct mxser_port {
 
        unsigned long ioaddr;
        unsigned long opmode_ioaddr;
-       speed_t max_baud;
 
        u8 rx_high_water;
        u8 rx_low_water;
@@ -372,6 +371,7 @@ struct mxser_board {
        unsigned long vector_mask;
 
        enum mxser_must_hwid must_hwid;
+       speed_t max_baud;
 
        struct mxser_port ports[MXSER_PORTS_PER_BOARD];
 };
@@ -671,7 +671,7 @@ static int mxser_set_baud(struct tty_struct *tty, speed_t newspd)
        if (!info->ioaddr)
                return -1;
 
-       if (newspd > info->max_baud)
+       if (newspd > info->board->max_baud)
                return -1;
 
        if (newspd == 134) {
@@ -2345,9 +2345,6 @@ static int mxser_initbrd(struct mxser_board *brd)
        unsigned int i;
        int retval;
 
-       printk(KERN_INFO "mxser: max. baud rate = %d bps\n",
-                       brd->ports[0].max_baud);
-
        for (i = 0; i < brd->info->nports; i++) {
                info = &brd->ports[i];
                tty_port_init(&info->port);
@@ -2455,17 +2452,14 @@ static int mxser_probe(struct pci_dev *pdev,
        brd->must_hwid = mxser_must_get_hwid(brd->ports[0].ioaddr);
        brd->vector_mask = 0;
 
-       for (i = 0; i < brd->info->nports; i++) {
-               for (j = 0; j < UART_INFO_NUM; j++) {
-                       if (Gpci_uart_info[j].type == brd->must_hwid) {
-                               brd->ports[i].max_baud =
-                                       Gpci_uart_info[j].max_baud;
-
-                               /* exception....CP-102 */
-                               if (brd->info->flags & MXSER_HIGHBAUD)
-                                       brd->ports[i].max_baud = 921600;
-                               break;
-                       }
+       for (j = 0; j < UART_INFO_NUM; j++) {
+               if (Gpci_uart_info[j].type == brd->must_hwid) {
+                       brd->max_baud = Gpci_uart_info[j].max_baud;
+
+                       /* exception....CP-102 */
+                       if (brd->info->flags & MXSER_HIGHBAUD)
+                               brd->max_baud = 921600;
+                       break;
                }
        }