lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] atmel_serial: Rename at91_register_uart_fns

Browse Source 
Rename at91_register_uart_fns and associated structs and variables
to make it consistent with the atmel_ prefix used by the rest of
the driver.

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:07 +02:00
committed by Linus Torvalds
parent 9ab4f88b7f
commit 71f2e2b878
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/serial/atmel_serial.c
View File

@@ -101,8 +101,8 @@
//#define UART_PUT_TNPR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNPR) //#define UART_PUT_TNPR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNPR)
//#define UART_PUT_TNCR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNCR) //#define UART_PUT_TNCR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNCR)
static int (*at91_open)(struct uart_port *); static int (*atmel_open_hook)(struct uart_port *);
static void (*at91_close)(struct uart_port *); static void (*atmel_close_hook)(struct uart_port *);
/* /*
* We wrap our port structure around the generic uart_port. * We wrap our port structure around the generic uart_port.
@@ -399,8 +399,8 @@ static int atmel_startup(struct uart_port *port)
* If there is a specific "open" function (to register * If there is a specific "open" function (to register
* control line interrupts) * control line interrupts)
*/ */
if (at91_open) { if (atmel_open_hook) {
retval = at91_open(port); retval = atmel_open_hook(port);
if (retval) { if (retval) {
free_irq(port->irq, port); free_irq(port->irq, port);
return retval; return retval;
@@ -440,8 +440,8 @@ static void atmel_shutdown(struct uart_port *port)
* If there is a specific "close" function (to unregister * If there is a specific "close" function (to unregister
* control line interrupts) * control line interrupts)
*/ */
if (at91_close) if (atmel_close_hook)
at91_close(port); atmel_close_hook(port);
} }
/* /*
@@ -711,7 +711,7 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, struct
/* /*
* Register board-specific modem-control line handlers. * Register board-specific modem-control line handlers.
*/ */
void __init at91_register_uart_fns(struct at91_port_fns *fns) void __init atmel_register_uart_fns(struct atmel_port_fns *fns)
{ {
if (fns->enable_ms) if (fns->enable_ms)
atmel_pops.enable_ms = fns->enable_ms; atmel_pops.enable_ms = fns->enable_ms;
@@ -719,8 +719,8 @@ void __init at91_register_uart_fns(struct at91_port_fns *fns)
atmel_pops.get_mctrl = fns->get_mctrl; atmel_pops.get_mctrl = fns->get_mctrl;
if (fns->set_mctrl) if (fns->set_mctrl)
atmel_pops.set_mctrl = fns->set_mctrl; atmel_pops.set_mctrl = fns->set_mctrl;
at91_open = fns->open; atmel_open_hook = fns->open;
at91_close = fns->close; atmel_close_hook = fns->close;
atmel_pops.pm = fns->pm; atmel_pops.pm = fns->pm;
atmel_pops.set_wake = fns->set_wake; atmel_pops.set_wake = fns->set_wake;
} }

6
include/asm-arm/mach/serial_at91.h
View File

@@ -14,7 +14,7 @@ struct uart_port;
* This is a temporary structure for registering these * This is a temporary structure for registering these
* functions; it is intended to be discarded after boot. * functions; it is intended to be discarded after boot.
*/ */
struct at91_port_fns { struct atmel_port_fns {
void (*set_mctrl)(struct uart_port *, u_int); void (*set_mctrl)(struct uart_port *, u_int);
u_int (*get_mctrl)(struct uart_port *); u_int (*get_mctrl)(struct uart_port *);
void (*enable_ms)(struct uart_port *); void (*enable_ms)(struct uart_port *);
@@ -25,9 +25,9 @@ struct at91_port_fns {
}; };
#if defined(CONFIG_SERIAL_ATMEL) #if defined(CONFIG_SERIAL_ATMEL)
void at91_register_uart_fns(struct at91_port_fns *fns); void atmel_register_uart_fns(struct atmel_port_fns *fns);
#else #else
#define at91_register_uart_fns(fns) do { } while (0) #define atmel_register_uart_fns(fns) do { } while (0)
#endif #endif

6
include/asm-avr32/mach/serial_at91.h
View File

@@ -14,7 +14,7 @@ struct uart_port;
* This is a temporary structure for registering these * This is a temporary structure for registering these
* functions; it is intended to be discarded after boot. * functions; it is intended to be discarded after boot.
*/ */
struct at91_port_fns { struct atmel_port_fns {
void (*set_mctrl)(struct uart_port *, u_int); void (*set_mctrl)(struct uart_port *, u_int);
u_int (*get_mctrl)(struct uart_port *); u_int (*get_mctrl)(struct uart_port *);
void (*enable_ms)(struct uart_port *); void (*enable_ms)(struct uart_port *);
@@ -25,9 +25,9 @@ struct at91_port_fns {
}; };
#if defined(CONFIG_SERIAL_ATMEL) #if defined(CONFIG_SERIAL_ATMEL)
void at91_register_uart_fns(struct at91_port_fns *fns); void atmel_register_uart_fns(struct atmel_port_fns *fns);
#else #else
#define at91_register_uart_fns(fns) do { } while (0) #define atmel_register_uart_fns(fns) do { } while (0)
#endif #endif