diff options
| author | Jiri Slaby (SUSE) <jirislaby@kernel.org> | 2025-06-23 12:12:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-24 15:32:50 +0100 |
| commit | f5655940771fbc75efadfe91ca081525732bed3f (patch) | |
| tree | 1e854eda967277216e1ee5e8cbef911a893675e4 | |
| parent | b20d6576cdb3530d4a2d81611a8b8eb99780ce3e (diff) | |
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)" <jirislaby@kernel.org>
Fixes: fc9ceb501e38 ("serial: 8250: sanitize uart_port::serial_{in,out}() types")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202506190552.TqNasrC3-lkp@intel.com/
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Link: https://lore.kernel.org/r/20250623101246.486866-1-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/platform/ce4100/ce4100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index f8126821a94d..f19d20f0dfa4 100644 --- a/arch/x86/platform/ce4100/ce4100.c +++ b/arch/x86/platform/ce4100/ce4100.c @@ -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); |