aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/atmel_serial.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial/atmel_serial.c')
-rw-r--r--drivers/serial/atmel_serial.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 2c5b72ccc4be..2f9d99bb9587 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -101,8 +101,8 @@
101//#define UART_PUT_TNPR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNPR) 101//#define UART_PUT_TNPR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNPR)
102//#define UART_PUT_TNCR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNCR) 102//#define UART_PUT_TNCR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNCR)
103 103
104static int (*at91_open)(struct uart_port *); 104static int (*atmel_open_hook)(struct uart_port *);
105static void (*at91_close)(struct uart_port *); 105static void (*atmel_close_hook)(struct uart_port *);
106 106
107/* 107/*
108 * We wrap our port structure around the generic uart_port. 108 * We wrap our port structure around the generic uart_port.
@@ -399,8 +399,8 @@ static int atmel_startup(struct uart_port *port)
399 * If there is a specific "open" function (to register 399 * If there is a specific "open" function (to register
400 * control line interrupts) 400 * control line interrupts)
401 */ 401 */
402 if (at91_open) { 402 if (atmel_open_hook) {
403 retval = at91_open(port); 403 retval = atmel_open_hook(port);
404 if (retval) { 404 if (retval) {
405 free_irq(port->irq, port); 405 free_irq(port->irq, port);
406 return retval; 406 return retval;
@@ -440,8 +440,8 @@ static void atmel_shutdown(struct uart_port *port)
440 * If there is a specific "close" function (to unregister 440 * If there is a specific "close" function (to unregister
441 * control line interrupts) 441 * control line interrupts)
442 */ 442 */
443 if (at91_close) 443 if (atmel_close_hook)
444 at91_close(port); 444 atmel_close_hook(port);
445} 445}
446 446
447/* 447/*
@@ -711,7 +711,7 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, struct
711/* 711/*
712 * Register board-specific modem-control line handlers. 712 * Register board-specific modem-control line handlers.
713 */ 713 */
714void __init at91_register_uart_fns(struct at91_port_fns *fns) 714void __init atmel_register_uart_fns(struct atmel_port_fns *fns)
715{ 715{
716 if (fns->enable_ms) 716 if (fns->enable_ms)
717 atmel_pops.enable_ms = fns->enable_ms; 717 atmel_pops.enable_ms = fns->enable_ms;
@@ -719,8 +719,8 @@ void __init at91_register_uart_fns(struct at91_port_fns *fns)
719 atmel_pops.get_mctrl = fns->get_mctrl; 719 atmel_pops.get_mctrl = fns->get_mctrl;
720 if (fns->set_mctrl) 720 if (fns->set_mctrl)
721 atmel_pops.set_mctrl = fns->set_mctrl; 721 atmel_pops.set_mctrl = fns->set_mctrl;
722 at91_open = fns->open; 722 atmel_open_hook = fns->open;
723 at91_close = fns->close; 723 atmel_close_hook = fns->close;
724 atmel_pops.pm = fns->pm; 724 atmel_pops.pm = fns->pm;
725 atmel_pops.set_wake = fns->set_wake; 725 atmel_pops.set_wake = fns->set_wake;
726} 726}