]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
serial: ce4100: fix build after serial_in/out() changes
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Mon, 23 Jun 2025 10:12:45 +0000 (12:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2025 14:32:50 +0000 (15:32 +0100)
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>
arch/x86/platform/ce4100/ce4100.c

index f8126821a94d76239d3154aeebb7119978e96dd2..f19d20f0dfa463593e4edca49c7d34effc3034fd 100644 (file)
@@ -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);