hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SERIAL] Remove m32r_sio dependency on asm/serial.h 

m32r_sio re-uses a custom defined BASE_BAUD from asm/serial.h,
and replaces SERIAL_PORT_DFNS with its own driver private copy.
Since asm/serial.h is supposed to define 8250-based ports using
these symbols, this isn't a sane idea.

Hence, eliminate asm/serial.h from m32r_sio.c.

Acked-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2006-08-30 15:30:39 +01:00 committed by Russell King
parent bf60362566
commit de6cc84f72
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/serial/m32r_sio.c
View File

@ -76,7 +76,7 @@
*/ */
#define is_real_interrupt(irq) ((irq) != 0) #define is_real_interrupt(irq) ((irq) != 0)
#include <asm/serial.h> #define BASE_BAUD 115200
/* Standard COM flags */ /* Standard COM flags */
#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) #define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
@ -86,7 +86,6 @@
* standard enumeration mechanism. Platforms that can find all * standard enumeration mechanism. Platforms that can find all
* serial ports via mechanisms like ACPI or PCI need not supply it. * serial ports via mechanisms like ACPI or PCI need not supply it.
*/ */
#undef SERIAL_PORT_DFNS
#if defined(CONFIG_PLAT_USRV) #if defined(CONFIG_PLAT_USRV)
#define SERIAL_PORT_DFNS \ #define SERIAL_PORT_DFNS \
@ -109,7 +108,7 @@
#endif /* !CONFIG_PLAT_USRV */ #endif /* !CONFIG_PLAT_USRV */
static struct old_serial_port old_serial_port[] = { static struct old_serial_port old_serial_port[] = {
SERIAL_PORT_DFNS /* defined in asm/serial.h */ SERIAL_PORT_DFNS
}; };
#define UART_NR ARRAY_SIZE(old_serial_port) #define UART_NR ARRAY_SIZE(old_serial_port)