serial: ce4100: fix build after serial_in/out() changes
Subsystems (2)
Jiri Slaby (SUSE)
maintainerPATCH 1/2 serial: ce4100: fix build after serial_in/out() changes
This x86_32 driver remain unnoticed, so after the commit below, the
compilation now fails with:
arch/x86/platform/ce4100/ce4100.c:107:16: error: incompatible function pointer types assigning to '...' from '...'
To fix the error, convert also ce4100 to the new
uart_port::serial_{in,out}() types.
Signed-off-by Jiri Slaby (SUSE) <[email protected]>
Fixes fc9ceb501e38 ("serial: 8250: sanitize uart_port::serial_{in,out}() types")
Reported-by kernel test robot <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
--- arch/x86/platform/ce4100/ce4100.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/platform/ce4100/ce4100.c +3 -3
@@ -49,9 +49,9 @@ static unsigned int mem_serial_in(struct uart_port *p, int offset)* errata number 9 in Errata - B step. */ -static unsigned int ce4100_mem_serial_in (struct uart_port *p,int offset) +static u32 ce4100_mem_serial_in (struct uart_port *p,unsigned int offset) { -unsigned int ret, ier, lsr; +u32 ret, ier, lsr;if (offset ==UART_IIR ) { offset = offset << p->regshift;
@@ -73,7 +73,7 @@ static unsigned int ce4100_mem_serial_in(struct uart_port *p, int offset)return ret; } -static void ce4100_mem_serial_out (struct uart_port *p,int offset,int value) +static void ce4100_mem_serial_out (struct uart_port *p,unsigned int offset,u32 value) { offset = offset << p->regshift;writel (value, p->membase + offset);
Signature · 1 line
2.50.0
Jiri Slaby (SUSE)
maintainerPATCH 2/2 serial: ce4100: clean up serial_in/out() hooks
ce4100_mem_serial_in() unnecessarily contains 4 nested 'if's. That makes the code hard to follow. Invert the conditions and return early if the particular conditions do not hold.
And use "<<=" for shifting the offset in both of the hooks.
Signed-off-by Jiri Slaby (SUSE) <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
--- arch/x86/platform/ce4100/ce4100.c | 39 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 18 deletions(-)
arch/x86/platform/ce4100/ce4100.c +21 -18
@@ -53,29 +53,32 @@ static u32 ce4100_mem_serial_in(struct uart_port *p, unsigned int offset) {u32 ret, ier, lsr; -if (offset ==UART_IIR ) { - offset = offset << p->regshift; - ret =readl (p->membase + offset); -if (ret &UART_IIR_NO_INT ) { -/* see if the TX interrupt should have really set */ - ier =mem_serial_in (p,UART_IER ); -/* see if the UART's XMIT interrupt is enabled */ -if (ier &UART_IER_THRI ) { - lsr =mem_serial_in (p,UART_LSR ); -/* now check to see if the UART should be -generating an interrupt (but isn't) */ -if (lsr & (UART_LSR_THRE |UART_LSR_TEMT )) - ret &= ~UART_IIR_NO_INT ; - } - } - }else - ret =mem_serial_in (p, offset); +if (offset !=UART_IIR ) +return mem_serial_in (p, offset); + + offset <<= p->regshift; + + ret =readl (p->membase + offset); +if (!(ret &UART_IIR_NO_INT )) +return ret; + +/* see if the TX interrupt should have really set */ + ier =mem_serial_in (p,UART_IER ); +/* see if the UART's XMIT interrupt is enabled */ +if (!(ier &UART_IER_THRI )) +return ret; + + lsr =mem_serial_in (p,UART_LSR ); +/* now check to see if the UART should be generating an interrupt (but isn't) */ +if (lsr & (UART_LSR_THRE |UART_LSR_TEMT )) + ret &= ~UART_IIR_NO_INT ; +return ret; }static void ce4100_mem_serial_out (struct uart_port *p,unsigned int offset,u32 value) { - offset = offset << p->regshift; + offset <<= p->regshift;writel (value, p->membase + offset); }
Signature · 1 line
2.50.0