Skip to content

Commit 53edbd4

Browse files
Jiri Slaby (SUSE)gregkh
Jiri Slaby (SUSE)
authored and
gregkh
committed
tty: sunsu: drop serial_{in,out}p()
They are simple wrappers around serial_{in/out}() without actually pausing the execution. Since ever. So drop these useless wrappers. Signed-off-by: Jiri Slaby (SUSE) <[email protected]> Cc: David S. Miller <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 49ddb69 commit 53edbd4

File tree

1 file changed

+77
-87
lines changed

1 file changed

+77
-87
lines changed

‎drivers/tty/serial/sunsu.c

Lines changed: 77 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,6 @@ static void serial_out(struct uart_sunsu_port *up, int offset, int value)
150150
}
151151
}
152152

153-
/*
154-
* We used to support using pause I/O for certain machines. We
155-
* haven't supported this for a while, but just in case it's badly
156-
* needed for certain old 386 machines, I've left these #define's
157-
* in....
158-
*/
159-
#define serial_inp(up, offset) serial_in(up, offset)
160-
#define serial_outp(up, offset, value) serial_out(up, offset, value)
161-
162-
163153
/*
164154
* For the 16C950
165155
*/
@@ -193,12 +183,12 @@ static int __enable_rsa(struct uart_sunsu_port *up)
193183
unsigned char mode;
194184
int result;
195185

196-
mode = serial_inp(up, UART_RSA_MSR);
186+
mode = serial_in(up, UART_RSA_MSR);
197187
result = mode & UART_RSA_MSR_FIFO;
198188

199189
if (!result) {
200-
serial_outp(up, UART_RSA_MSR, mode | UART_RSA_MSR_FIFO);
201-
mode = serial_inp(up, UART_RSA_MSR);
190+
serial_out(up, UART_RSA_MSR, mode | UART_RSA_MSR_FIFO);
191+
mode = serial_in(up, UART_RSA_MSR);
202192
result = mode & UART_RSA_MSR_FIFO;
203193
}
204194

@@ -217,7 +207,7 @@ static void enable_rsa(struct uart_sunsu_port *up)
217207
uart_port_unlock_irq(&up->port);
218208
}
219209
if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
220-
serial_outp(up, UART_RSA_FRR, 0);
210+
serial_out(up, UART_RSA_FRR, 0);
221211
}
222212
}
223213

@@ -236,12 +226,12 @@ static void disable_rsa(struct uart_sunsu_port *up)
236226
up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16) {
237227
uart_port_lock_irq(&up->port);
238228

239-
mode = serial_inp(up, UART_RSA_MSR);
229+
mode = serial_in(up, UART_RSA_MSR);
240230
result = !(mode & UART_RSA_MSR_FIFO);
241231

242232
if (!result) {
243-
serial_outp(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
244-
mode = serial_inp(up, UART_RSA_MSR);
233+
serial_out(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
234+
mode = serial_in(up, UART_RSA_MSR);
245235
result = !(mode & UART_RSA_MSR_FIFO);
246236
}
247237

@@ -326,7 +316,7 @@ receive_chars(struct uart_sunsu_port *up, unsigned char *status)
326316
int saw_console_brk = 0;
327317

328318
do {
329-
ch = serial_inp(up, UART_RX);
319+
ch = serial_in(up, UART_RX);
330320
flag = TTY_NORMAL;
331321
up->port.icount.rx++;
332322

@@ -387,7 +377,7 @@ receive_chars(struct uart_sunsu_port *up, unsigned char *status)
387377
*/
388378
tty_insert_flip_char(port, 0, TTY_OVERRUN);
389379
ignore_char:
390-
*status = serial_inp(up, UART_LSR);
380+
*status = serial_in(up, UART_LSR);
391381
} while ((*status & UART_LSR_DR) && (max_count-- > 0));
392382

393383
if (saw_console_brk)
@@ -401,7 +391,7 @@ static void transmit_chars(struct uart_sunsu_port *up)
401391
int count;
402392

403393
if (up->port.x_char) {
404-
serial_outp(up, UART_TX, up->port.x_char);
394+
serial_out(up, UART_TX, up->port.x_char);
405395
up->port.icount.tx++;
406396
up->port.x_char = 0;
407397
return;
@@ -460,7 +450,7 @@ static irqreturn_t sunsu_serial_interrupt(int irq, void *dev_id)
460450
uart_port_lock_irqsave(&up->port, &flags);
461451

462452
do {
463-
status = serial_inp(up, UART_LSR);
453+
status = serial_in(up, UART_LSR);
464454
if (status & UART_LSR_DR)
465455
receive_chars(up, &status);
466456
check_modem_status(up);
@@ -498,7 +488,7 @@ static void sunsu_change_mouse_baud(struct uart_sunsu_port *up)
498488
static void receive_kbd_ms_chars(struct uart_sunsu_port *up, int is_break)
499489
{
500490
do {
501-
unsigned char ch = serial_inp(up, UART_RX);
491+
unsigned char ch = serial_in(up, UART_RX);
502492

503493
/* Stop-A is handled by drivers/char/keyboard.c now. */
504494
if (up->su_type == SU_PORT_KBD) {
@@ -530,7 +520,7 @@ static irqreturn_t sunsu_kbd_ms_interrupt(int irq, void *dev_id)
530520
struct uart_sunsu_port *up = dev_id;
531521

532522
if (!(serial_in(up, UART_IIR) & UART_IIR_NO_INT)) {
533-
unsigned char status = serial_inp(up, UART_LSR);
523+
unsigned char status = serial_in(up, UART_LSR);
534524

535525
if ((status & UART_LSR_DR) || (status & UART_LSR_BI))
536526
receive_kbd_ms_chars(up, (status & UART_LSR_BI) != 0);
@@ -619,14 +609,14 @@ static int sunsu_startup(struct uart_port *port)
619609
if (up->port.type == PORT_16C950) {
620610
/* Wake up and initialize UART */
621611
up->acr = 0;
622-
serial_outp(up, UART_LCR, 0xBF);
623-
serial_outp(up, UART_EFR, UART_EFR_ECB);
624-
serial_outp(up, UART_IER, 0);
625-
serial_outp(up, UART_LCR, 0);
612+
serial_out(up, UART_LCR, 0xBF);
613+
serial_out(up, UART_EFR, UART_EFR_ECB);
614+
serial_out(up, UART_IER, 0);
615+
serial_out(up, UART_LCR, 0);
626616
serial_icr_write(up, UART_CSR, 0); /* Reset the UART */
627-
serial_outp(up, UART_LCR, 0xBF);
628-
serial_outp(up, UART_EFR, UART_EFR_ECB);
629-
serial_outp(up, UART_LCR, 0);
617+
serial_out(up, UART_LCR, 0xBF);
618+
serial_out(up, UART_EFR, UART_EFR_ECB);
619+
serial_out(up, UART_LCR, 0);
630620
}
631621

632622
#ifdef CONFIG_SERIAL_8250_RSA
@@ -642,27 +632,27 @@ static int sunsu_startup(struct uart_port *port)
642632
* (they will be reenabled in set_termios())
643633
*/
644634
if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) {
645-
serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
646-
serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
635+
serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
636+
serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO |
647637
UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
648-
serial_outp(up, UART_FCR, 0);
638+
serial_out(up, UART_FCR, 0);
649639
}
650640

651641
/*
652642
* Clear the interrupt registers.
653643
*/
654-
(void) serial_inp(up, UART_LSR);
655-
(void) serial_inp(up, UART_RX);
656-
(void) serial_inp(up, UART_IIR);
657-
(void) serial_inp(up, UART_MSR);
644+
(void) serial_in(up, UART_LSR);
645+
(void) serial_in(up, UART_RX);
646+
(void) serial_in(up, UART_IIR);
647+
(void) serial_in(up, UART_MSR);
658648

659649
/*
660650
* At this point, there's no way the LSR could still be 0xff;
661651
* if it is, then bail out, because there's likely no UART
662652
* here.
663653
*/
664654
if (!(up->port.flags & UPF_BUGGY_UART) &&
665-
(serial_inp(up, UART_LSR) == 0xff)) {
655+
(serial_in(up, UART_LSR) == 0xff)) {
666656
printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
667657
return -ENODEV;
668658
}
@@ -682,7 +672,7 @@ static int sunsu_startup(struct uart_port *port)
682672
/*
683673
* Now, initialize the UART
684674
*/
685-
serial_outp(up, UART_LCR, UART_LCR_WLEN8);
675+
serial_out(up, UART_LCR, UART_LCR_WLEN8);
686676

687677
uart_port_lock_irqsave(&up->port, &flags);
688678

@@ -697,7 +687,7 @@ static int sunsu_startup(struct uart_port *port)
697687
* anyway, so we don't enable them here.
698688
*/
699689
up->ier = UART_IER_RLSI | UART_IER_RDI;
700-
serial_outp(up, UART_IER, up->ier);
690+
serial_out(up, UART_IER, up->ier);
701691

702692
if (up->port.flags & UPF_FOURPORT) {
703693
unsigned int icp;
@@ -712,10 +702,10 @@ static int sunsu_startup(struct uart_port *port)
712702
/*
713703
* And clear the interrupt registers again for luck.
714704
*/
715-
(void) serial_inp(up, UART_LSR);
716-
(void) serial_inp(up, UART_RX);
717-
(void) serial_inp(up, UART_IIR);
718-
(void) serial_inp(up, UART_MSR);
705+
(void) serial_in(up, UART_LSR);
706+
(void) serial_in(up, UART_RX);
707+
(void) serial_in(up, UART_IIR);
708+
(void) serial_in(up, UART_MSR);
719709

720710
return 0;
721711
}
@@ -730,7 +720,7 @@ static void sunsu_shutdown(struct uart_port *port)
730720
* Disable interrupts from this port
731721
*/
732722
up->ier = 0;
733-
serial_outp(up, UART_IER, 0);
723+
serial_out(up, UART_IER, 0);
734724

735725
uart_port_lock_irqsave(&up->port, &flags);
736726
if (up->port.flags & UPF_FOURPORT) {
@@ -746,11 +736,11 @@ static void sunsu_shutdown(struct uart_port *port)
746736
/*
747737
* Disable break condition and FIFOs
748738
*/
749-
serial_out(up, UART_LCR, serial_inp(up, UART_LCR) & ~UART_LCR_SBC);
750-
serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
739+
serial_out(up, UART_LCR, serial_in(up, UART_LCR) & ~UART_LCR_SBC);
740+
serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO |
751741
UART_FCR_CLEAR_RCVR |
752742
UART_FCR_CLEAR_XMIT);
753-
serial_outp(up, UART_FCR, 0);
743+
serial_out(up, UART_FCR, 0);
754744

755745
#ifdef CONFIG_SERIAL_8250_RSA
756746
/*
@@ -872,22 +862,22 @@ sunsu_change_speed(struct uart_port *port, unsigned int cflag,
872862
serial_out(up, UART_IER, up->ier);
873863

874864
if (uart_config[up->port.type].flags & UART_STARTECH) {
875-
serial_outp(up, UART_LCR, 0xBF);
876-
serial_outp(up, UART_EFR, cflag & CRTSCTS ? UART_EFR_CTS :0);
865+
serial_out(up, UART_LCR, 0xBF);
866+
serial_out(up, UART_EFR, cflag & CRTSCTS ? UART_EFR_CTS :0);
877867
}
878-
serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
879-
serial_outp(up, UART_DLL, quot & 0xff); /* LS of divisor */
880-
serial_outp(up, UART_DLM, quot >> 8); /* MS of divisor */
868+
serial_out(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
869+
serial_out(up, UART_DLL, quot & 0xff); /* LS of divisor */
870+
serial_out(up, UART_DLM, quot >> 8); /* MS of divisor */
881871
if (up->port.type == PORT_16750)
882-
serial_outp(up, UART_FCR, fcr); /* set fcr */
883-
serial_outp(up, UART_LCR, cval); /* reset DLAB */
872+
serial_out(up, UART_FCR, fcr); /* set fcr */
873+
serial_out(up, UART_LCR, cval); /* reset DLAB */
884874
up->lcr = cval; /* Save LCR */
885875
if (up->port.type != PORT_16750) {
886876
if (fcr & UART_FCR_ENABLE_FIFO) {
887877
/* emulated UARTs (Lucent Venus 167x) need two steps */
888-
serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
878+
serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
889879
}
890-
serial_outp(up, UART_FCR, fcr); /* set fcr */
880+
serial_out(up, UART_FCR, fcr); /* set fcr */
891881
}
892882

893883
up->cflag = cflag;
@@ -1051,18 +1041,18 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
10511041
* 0x80 is a non-existent port; which should be safe since
10521042
* include/asm/io.h also makes this assumption.
10531043
*/
1054-
scratch = serial_inp(up, UART_IER);
1055-
serial_outp(up, UART_IER, 0);
1044+
scratch = serial_in(up, UART_IER);
1045+
serial_out(up, UART_IER, 0);
10561046
#ifdef __i386__
10571047
outb(0xff, 0x080);
10581048
#endif
1059-
scratch2 = serial_inp(up, UART_IER);
1060-
serial_outp(up, UART_IER, 0x0f);
1049+
scratch2 = serial_in(up, UART_IER);
1050+
serial_out(up, UART_IER, 0x0f);
10611051
#ifdef __i386__
10621052
outb(0, 0x080);
10631053
#endif
1064-
scratch3 = serial_inp(up, UART_IER);
1065-
serial_outp(up, UART_IER, scratch);
1054+
scratch3 = serial_in(up, UART_IER);
1055+
serial_out(up, UART_IER, scratch);
10661056
if (scratch2 != 0 || scratch3 != 0x0F)
10671057
goto out; /* We failed; there's nothing here */
10681058
}
@@ -1080,16 +1070,16 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
10801070
* that conflicts with COM 1-4 --- we hope!
10811071
*/
10821072
if (!(up->port.flags & UPF_SKIP_TEST)) {
1083-
serial_outp(up, UART_MCR, UART_MCR_LOOP | 0x0A);
1084-
status1 = serial_inp(up, UART_MSR) & 0xF0;
1085-
serial_outp(up, UART_MCR, save_mcr);
1073+
serial_out(up, UART_MCR, UART_MCR_LOOP | 0x0A);
1074+
status1 = serial_in(up, UART_MSR) & 0xF0;
1075+
serial_out(up, UART_MCR, save_mcr);
10861076
if (status1 != 0x90)
10871077
goto out; /* We failed loopback test */
10881078
}
1089-
serial_outp(up, UART_LCR, 0xBF); /* set up for StarTech test */
1090-
serial_outp(up, UART_EFR, 0); /* EFR is the same as FCR */
1091-
serial_outp(up, UART_LCR, 0);
1092-
serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
1079+
serial_out(up, UART_LCR, 0xBF); /* set up for StarTech test */
1080+
serial_out(up, UART_EFR, 0); /* EFR is the same as FCR */
1081+
serial_out(up, UART_LCR, 0);
1082+
serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
10931083
scratch = serial_in(up, UART_IIR) >> 6;
10941084
switch (scratch) {
10951085
case 0:
@@ -1107,19 +1097,19 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
11071097
}
11081098
if (up->port.type == PORT_16550A) {
11091099
/* Check for Startech UART's */
1110-
serial_outp(up, UART_LCR, UART_LCR_DLAB);
1100+
serial_out(up, UART_LCR, UART_LCR_DLAB);
11111101
if (serial_in(up, UART_EFR) == 0) {
11121102
up->port.type = PORT_16650;
11131103
} else {
1114-
serial_outp(up, UART_LCR, 0xBF);
1104+
serial_out(up, UART_LCR, 0xBF);
11151105
if (serial_in(up, UART_EFR) == 0)
11161106
up->port.type = PORT_16650V2;
11171107
}
11181108
}
11191109
if (up->port.type == PORT_16550A) {
11201110
/* Check for TI 16750 */
1121-
serial_outp(up, UART_LCR, save_lcr | UART_LCR_DLAB);
1122-
serial_outp(up, UART_FCR,
1111+
serial_out(up, UART_LCR, save_lcr | UART_LCR_DLAB);
1112+
serial_out(up, UART_FCR,
11231113
UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
11241114
scratch = serial_in(up, UART_IIR) >> 5;
11251115
if (scratch == 7) {
@@ -1129,24 +1119,24 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
11291119
* mode if the UART_FCR7_64BYTE bit was set
11301120
* while UART_LCR_DLAB was latched.
11311121
*/
1132-
serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
1133-
serial_outp(up, UART_LCR, 0);
1134-
serial_outp(up, UART_FCR,
1122+
serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
1123+
serial_out(up, UART_LCR, 0);
1124+
serial_out(up, UART_FCR,
11351125
UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
11361126
scratch = serial_in(up, UART_IIR) >> 5;
11371127
if (scratch == 6)
11381128
up->port.type = PORT_16750;
11391129
}
1140-
serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
1130+
serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
11411131
}
1142-
serial_outp(up, UART_LCR, save_lcr);
1132+
serial_out(up, UART_LCR, save_lcr);
11431133
if (up->port.type == PORT_16450) {
11441134
scratch = serial_in(up, UART_SCR);
1145-
serial_outp(up, UART_SCR, 0xa5);
1135+
serial_out(up, UART_SCR, 0xa5);
11461136
status1 = serial_in(up, UART_SCR);
1147-
serial_outp(up, UART_SCR, 0x5a);
1137+
serial_out(up, UART_SCR, 0x5a);
11481138
status2 = serial_in(up, UART_SCR);
1149-
serial_outp(up, UART_SCR, scratch);
1139+
serial_out(up, UART_SCR, scratch);
11501140

11511141
if ((status1 != 0xa5) || (status2 != 0x5a))
11521142
up->port.type = PORT_8250;
@@ -1163,15 +1153,15 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
11631153
*/
11641154
#ifdef CONFIG_SERIAL_8250_RSA
11651155
if (up->port.type == PORT_RSA)
1166-
serial_outp(up, UART_RSA_FRR, 0);
1156+
serial_out(up, UART_RSA_FRR, 0);
11671157
#endif
1168-
serial_outp(up, UART_MCR, save_mcr);
1169-
serial_outp(up, UART_FCR, (UART_FCR_ENABLE_FIFO |
1158+
serial_out(up, UART_MCR, save_mcr);
1159+
serial_out(up, UART_FCR, (UART_FCR_ENABLE_FIFO |
11701160
UART_FCR_CLEAR_RCVR |
11711161
UART_FCR_CLEAR_XMIT));
1172-
serial_outp(up, UART_FCR, 0);
1162+
serial_out(up, UART_FCR, 0);
11731163
(void)serial_in(up, UART_RX);
1174-
serial_outp(up, UART_IER, 0);
1164+
serial_out(up, UART_IER, 0);
11751165

11761166
out:
11771167
uart_port_unlock_irqrestore(&up->port, flags);

0 commit comments

Comments
 (0)