OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin Serial Driver: move common variables out of serial headers and into the serial driver 

move common variables out of serial headers and into the serial driver and
rename "nr_ports" to "nr_active_ports" so as to easily differentiate
between BFIN_UART_NR_PORTS (the # of available) and nr_ports (the # of enabled)

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mike Frysinger 2008-10-13 10:33:16 +01:00 committed by Linus Torvalds
parent d273e20171
commit c9607ecc6e
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h
View File

@ -119,7 +119,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
bfin_write16(uart->port.membase + OFFSET_LSR, -1); bfin_write16(uart->port.membase + OFFSET_LSR, -1);
} }
struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
struct bfin_serial_res { struct bfin_serial_res {
unsigned long uart_base_addr; unsigned long uart_base_addr;
int uart_irq; int uart_irq;
@ -164,8 +163,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
#endif #endif
}; };
int nr_ports = ARRAY_SIZE(bfin_serial_resource);
#define DRIVER_NAME "bfin-uart" #define DRIVER_NAME "bfin-uart"
static void bfin_serial_hw_init(struct bfin_serial_port *uart) static void bfin_serial_hw_init(struct bfin_serial_port *uart)

2
arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
View File

@ -111,7 +111,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
bfin_write16(uart->port.membase + OFFSET_LSR, -1); bfin_write16(uart->port.membase + OFFSET_LSR, -1);
} }
struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
struct bfin_serial_res { struct bfin_serial_res {
unsigned long uart_base_addr; unsigned long uart_base_addr;
int uart_irq; int uart_irq;
@ -142,7 +141,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
#define DRIVER_NAME "bfin-uart" #define DRIVER_NAME "bfin-uart"
int nr_ports = BFIN_UART_NR_PORTS;
static void bfin_serial_hw_init(struct bfin_serial_port *uart) static void bfin_serial_hw_init(struct bfin_serial_port *uart)
{ {

3
arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h
View File

@ -119,7 +119,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
bfin_write16(uart->port.membase + OFFSET_LSR, -1); bfin_write16(uart->port.membase + OFFSET_LSR, -1);
} }
struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
struct bfin_serial_res { struct bfin_serial_res {
unsigned long uart_base_addr; unsigned long uart_base_addr;
int uart_irq; int uart_irq;
@ -164,8 +163,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
#endif #endif
}; };
int nr_ports = ARRAY_SIZE(bfin_serial_resource);
#define DRIVER_NAME "bfin-uart" #define DRIVER_NAME "bfin-uart"
static void bfin_serial_hw_init(struct bfin_serial_port *uart) static void bfin_serial_hw_init(struct bfin_serial_port *uart)

3
arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h
View File

@ -105,7 +105,6 @@ struct bfin_serial_port {
#endif #endif
}; };
struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
struct bfin_serial_res { struct bfin_serial_res {
unsigned long uart_base_addr; unsigned long uart_base_addr;
int uart_irq; int uart_irq;
@ -170,8 +169,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
#endif #endif
}; };
int nr_ports = ARRAY_SIZE(bfin_serial_resource);
#define DRIVER_NAME "bfin-uart" #define DRIVER_NAME "bfin-uart"
static void bfin_serial_hw_init(struct bfin_serial_port *uart) static void bfin_serial_hw_init(struct bfin_serial_port *uart)

2
arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
View File

@ -111,7 +111,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
bfin_write16(uart->port.membase + OFFSET_LSR, -1); bfin_write16(uart->port.membase + OFFSET_LSR, -1);
} }
struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
struct bfin_serial_res { struct bfin_serial_res {
unsigned long uart_base_addr; unsigned long uart_base_addr;
int uart_irq; int uart_irq;
@ -142,7 +141,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
#define DRIVER_NAME "bfin-uart" #define DRIVER_NAME "bfin-uart"
int nr_ports = BFIN_UART_NR_PORTS;
static void bfin_serial_hw_init(struct bfin_serial_port *uart) static void bfin_serial_hw_init(struct bfin_serial_port *uart)
{ {

17
drivers/serial/bfin_5xx.c
View File

@ -42,6 +42,9 @@
#define BFIN_SERIAL_MAJOR 204 #define BFIN_SERIAL_MAJOR 204
#define BFIN_SERIAL_MINOR 64 #define BFIN_SERIAL_MINOR 64
static struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
static int nr_active_ports = ARRAY_SIZE(bfin_serial_resource);
/* /*
* Setup for console. Argument comes from the menuconfig * Setup for console. Argument comes from the menuconfig
*/ */
@ -859,7 +862,7 @@ static void __init bfin_serial_init_ports(void)
return; return;
first = 0; first = 0;
for (i = 0; i < nr_ports; i++) { for (i = 0; i < nr_active_ports; i++) {
bfin_serial_ports[i].port.uartclk = get_sclk(); bfin_serial_ports[i].port.uartclk = get_sclk();
bfin_serial_ports[i].port.ops = &bfin_serial_pops; bfin_serial_ports[i].port.ops = &bfin_serial_pops;
bfin_serial_ports[i].port.line = i; bfin_serial_ports[i].port.line = i;
@ -961,7 +964,7 @@ bfin_serial_console_setup(struct console *co, char *options)
* if so, search for the first available port that does have * if so, search for the first available port that does have
* console support. * console support.
*/ */
if (co->index == -1 || co->index >= nr_ports) if (co->index == -1 || co->index >= nr_active_ports)
co->index = 0; co->index = 0;
uart = &bfin_serial_ports[co->index]; uart = &bfin_serial_ports[co->index];
@ -1072,7 +1075,7 @@ struct console __init *bfin_earlyserial_init(unsigned int port,
struct bfin_serial_port *uart; struct bfin_serial_port *uart;
struct ktermios t; struct ktermios t;
if (port == -1 || port >= nr_ports) if (port == -1 || port >= nr_active_ports)
port = 0; port = 0;
bfin_serial_init_ports(); bfin_serial_init_ports();
bfin_early_serial_console.index = port; bfin_early_serial_console.index = port;
@ -1102,7 +1105,7 @@ static int bfin_serial_suspend(struct platform_device *dev, pm_message_t state)
{ {
int i; int i;
for (i = 0; i < nr_ports; i++) { for (i = 0; i < nr_active_ports; i++) {
if (bfin_serial_ports[i].port.dev != &dev->dev) if (bfin_serial_ports[i].port.dev != &dev->dev)
continue; continue;
uart_suspend_port(&bfin_serial_reg, &bfin_serial_ports[i].port); uart_suspend_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
@ -1115,7 +1118,7 @@ static int bfin_serial_resume(struct platform_device *dev)
{ {
int i; int i;
for (i = 0; i < nr_ports; i++) { for (i = 0; i < nr_active_ports; i++) {
if (bfin_serial_ports[i].port.dev != &dev->dev) if (bfin_serial_ports[i].port.dev != &dev->dev)
continue; continue;
uart_resume_port(&bfin_serial_reg, &bfin_serial_ports[i].port); uart_resume_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
@ -1134,7 +1137,7 @@ static int bfin_serial_probe(struct platform_device *dev)
break; break;
if (i < dev->num_resources) { if (i < dev->num_resources) {
for (i = 0; i < nr_ports; i++, res++) { for (i = 0; i < nr_active_ports; i++, res++) {
if (bfin_serial_ports[i].port.mapbase != res->start) if (bfin_serial_ports[i].port.mapbase != res->start)
continue; continue;
bfin_serial_ports[i].port.dev = &dev->dev; bfin_serial_ports[i].port.dev = &dev->dev;
@ -1149,7 +1152,7 @@ static int bfin_serial_remove(struct platform_device *dev)
{ {
int i; int i;
for (i = 0; i < nr_ports; i++) { for (i = 0; i < nr_active_ports; i++) {
if (bfin_serial_ports[i].port.dev != &dev->dev) if (bfin_serial_ports[i].port.dev != &dev->dev)
continue; continue;
uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port); uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);