AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] serial: Rename PORT_AT91 -> PORT_ATMEL

Browse Source 
The at91_serial driver can be used with both AT32 and AT91 devices
from Atmel and has therefore been renamed atmel_serial. The only
thing left is to rename PORT_AT91 PORT_ATMEL.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Haavard Skinnemoen 2006-10-04 16:02:06 +02:00 committed by Linus Torvalds
parent 7192f92c79
commit 9ab4f88b7f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/serial/atmel_serial.c
View File

@ -581,7 +581,7 @@ static void atmel_set_termios(struct uart_port *port, struct termios * termios,
*/ */
static const char *atmel_type(struct uart_port *port) static const char *atmel_type(struct uart_port *port)
{ {
return (port->type == PORT_AT91) ? "ATMEL_SERIAL" : NULL; return (port->type == PORT_ATMEL) ? "ATMEL_SERIAL" : NULL;
} }
/* /*
@ -628,7 +628,7 @@ static int atmel_request_port(struct uart_port *port)
static void atmel_config_port(struct uart_port *port, int flags) static void atmel_config_port(struct uart_port *port, int flags)
{ {
if (flags & UART_CONFIG_TYPE) { if (flags & UART_CONFIG_TYPE) {
port->type = PORT_AT91; port->type = PORT_ATMEL;
atmel_request_port(port); atmel_request_port(port);
} }
} }
@ -639,7 +639,7 @@ static void atmel_config_port(struct uart_port *port, int flags)
static int atmel_verify_port(struct uart_port *port, struct serial_struct *ser) static int atmel_verify_port(struct uart_port *port, struct serial_struct *ser)
{ {
int ret = 0; int ret = 0;
if (ser->type != PORT_UNKNOWN && ser->type != PORT_AT91) if (ser->type != PORT_UNKNOWN && ser->type != PORT_ATMEL)
ret = -EINVAL; ret = -EINVAL;
if (port->irq != ser->irq) if (port->irq != ser->irq)
ret = -EINVAL; ret = -EINVAL;

4
include/linux/serial_core.h
View File

@ -67,8 +67,8 @@
/* Parisc type numbers. */ /* Parisc type numbers. */
#define PORT_MUX 48 #define PORT_MUX 48
/* Atmel AT91xxx SoC */ /* Atmel AT91 / AT32 SoC */
#define PORT_AT91 49 #define PORT_ATMEL 49
/* Macintosh Zilog type numbers */ /* Macintosh Zilog type numbers */
#define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */ #define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */