summaryrefslogtreecommitdiffstats
path: root/drivers/tty/mxser.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2017-09-12 06:39:55 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-04 04:15:47 -0400
commit2799707fbeea103866b5d11b243e3c7b2a2d9b26 (patch)
tree96cdf4ed1831256170060a5abcc6f7b1a2737f0d /drivers/tty/mxser.c
parent1d67243a8e77cdf63ee20bbd55c49771ff9c3090 (diff)
mxser: remove unused parameters
Remove * pdev from mxser_initbrd * old_termios from mxser_change_speed as they are unused and update the callers. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/mxser.c')
-rw-r--r--drivers/tty/mxser.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 1c0c9553bc05..7f7968475736 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -636,8 +636,7 @@ static int mxser_set_baud(struct tty_struct *tty, long newspd)
636 * This routine is called to set the UART divisor registers to match 636 * This routine is called to set the UART divisor registers to match
637 * the specified baud rate for a serial port. 637 * the specified baud rate for a serial port.
638 */ 638 */
639static int mxser_change_speed(struct tty_struct *tty, 639static int mxser_change_speed(struct tty_struct *tty)
640 struct ktermios *old_termios)
641{ 640{
642 struct mxser_port *info = tty->driver_data; 641 struct mxser_port *info = tty->driver_data;
643 unsigned cflag, cval, fcr; 642 unsigned cflag, cval, fcr;
@@ -939,7 +938,7 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)
939 /* 938 /*
940 * and set the speed of the serial port 939 * and set the speed of the serial port
941 */ 940 */
942 mxser_change_speed(tty, NULL); 941 mxser_change_speed(tty);
943 spin_unlock_irqrestore(&info->slock, flags); 942 spin_unlock_irqrestore(&info->slock, flags);
944 943
945 return 0; 944 return 0;
@@ -1282,7 +1281,7 @@ static int mxser_set_serial_info(struct tty_struct *tty,
1282 if (tty_port_initialized(port)) { 1281 if (tty_port_initialized(port)) {
1283 if (flags != (port->flags & ASYNC_SPD_MASK)) { 1282 if (flags != (port->flags & ASYNC_SPD_MASK)) {
1284 spin_lock_irqsave(&info->slock, sl_flags); 1283 spin_lock_irqsave(&info->slock, sl_flags);
1285 mxser_change_speed(tty, NULL); 1284 mxser_change_speed(tty);
1286 spin_unlock_irqrestore(&info->slock, sl_flags); 1285 spin_unlock_irqrestore(&info->slock, sl_flags);
1287 } 1286 }
1288 } else { 1287 } else {
@@ -1940,7 +1939,7 @@ static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termi
1940 unsigned long flags; 1939 unsigned long flags;
1941 1940
1942 spin_lock_irqsave(&info->slock, flags); 1941 spin_lock_irqsave(&info->slock, flags);
1943 mxser_change_speed(tty, old_termios); 1942 mxser_change_speed(tty);
1944 spin_unlock_irqrestore(&info->slock, flags); 1943 spin_unlock_irqrestore(&info->slock, flags);
1945 1944
1946 if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) { 1945 if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
@@ -2369,8 +2368,7 @@ static void mxser_release_ISA_res(struct mxser_board *brd)
2369 mxser_release_vector(brd); 2368 mxser_release_vector(brd);
2370} 2369}
2371 2370
2372static int mxser_initbrd(struct mxser_board *brd, 2371static int mxser_initbrd(struct mxser_board *brd)
2373 struct pci_dev *pdev)
2374{ 2372{
2375 struct mxser_port *info; 2373 struct mxser_port *info;
2376 unsigned int i; 2374 unsigned int i;
@@ -2634,7 +2632,7 @@ static int mxser_probe(struct pci_dev *pdev,
2634 } 2632 }
2635 2633
2636 /* mxser_initbrd will hook ISR. */ 2634 /* mxser_initbrd will hook ISR. */
2637 retval = mxser_initbrd(brd, pdev); 2635 retval = mxser_initbrd(brd);
2638 if (retval) 2636 if (retval)
2639 goto err_rel3; 2637 goto err_rel3;
2640 2638
@@ -2740,7 +2738,7 @@ static int __init mxser_module_init(void)
2740 brd->info->name, ioaddr[b]); 2738 brd->info->name, ioaddr[b]);
2741 2739
2742 /* mxser_initbrd will hook ISR. */ 2740 /* mxser_initbrd will hook ISR. */
2743 if (mxser_initbrd(brd, NULL) < 0) { 2741 if (mxser_initbrd(brd) < 0) {
2744 mxser_release_ISA_res(brd); 2742 mxser_release_ISA_res(brd);
2745 brd->info = NULL; 2743 brd->info = NULL;
2746 continue; 2744 continue;