Skip to content

Commit f565594

Browse files
Jiri Slaby (SUSE)gregkh
authored andcommitted
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: fc9ceb5 ("serial: 8250: sanitize uart_port::serial_{in,out}() types") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Dave Hansen <[email protected]> Cc: [email protected] Cc: "H. Peter Anvin" <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b20d657 commit f565594

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/platform/ce4100/ce4100.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ static unsigned int mem_serial_in(struct uart_port *p, int offset)
4949
* errata number 9 in Errata - B step.
5050
*/
5151

52-
static unsigned int ce4100_mem_serial_in(struct uart_port *p, int offset)
52+
static u32 ce4100_mem_serial_in(struct uart_port *p, unsigned int offset)
5353
{
54-
unsigned int ret, ier, lsr;
54+
u32 ret, ier, lsr;
5555

5656
if (offset == UART_IIR) {
5757
offset = offset << p->regshift;
@@ -73,7 +73,7 @@ static unsigned int ce4100_mem_serial_in(struct uart_port *p, int offset)
7373
return ret;
7474
}
7575

76-
static void ce4100_mem_serial_out(struct uart_port *p, int offset, int value)
76+
static void ce4100_mem_serial_out(struct uart_port *p, unsigned int offset, u32 value)
7777
{
7878
offset = offset << p->regshift;
7979
writel(value, p->membase + offset);

0 commit comments

Comments
 (0)