Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] atmel_serial: Rename at91_register_uart_fns

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>

authored by

Haavard Skinnemoen and committed by
Linus Torvalds
71f2e2b8 9ab4f88b

+15 -15
+9 -9
drivers/serial/atmel_serial.c
··· 101 101 //#define UART_PUT_TNPR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNPR) 102 102 //#define UART_PUT_TNCR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNCR) 103 103 104 - static int (*at91_open)(struct uart_port *); 105 - static void (*at91_close)(struct uart_port *); 104 + static int (*atmel_open_hook)(struct uart_port *); 105 + static void (*atmel_close_hook)(struct uart_port *); 106 106 107 107 /* 108 108 * We wrap our port structure around the generic uart_port. ··· 399 399 * If there is a specific "open" function (to register 400 400 * control line interrupts) 401 401 */ 402 - if (at91_open) { 403 - retval = at91_open(port); 402 + if (atmel_open_hook) { 403 + retval = atmel_open_hook(port); 404 404 if (retval) { 405 405 free_irq(port->irq, port); 406 406 return retval; ··· 440 440 * If there is a specific "close" function (to unregister 441 441 * control line interrupts) 442 442 */ 443 - if (at91_close) 444 - at91_close(port); 443 + if (atmel_close_hook) 444 + atmel_close_hook(port); 445 445 } 446 446 447 447 /* ··· 711 711 /* 712 712 * Register board-specific modem-control line handlers. 713 713 */ 714 - void __init at91_register_uart_fns(struct at91_port_fns *fns) 714 + void __init atmel_register_uart_fns(struct atmel_port_fns *fns) 715 715 { 716 716 if (fns->enable_ms) 717 717 atmel_pops.enable_ms = fns->enable_ms; ··· 719 719 atmel_pops.get_mctrl = fns->get_mctrl; 720 720 if (fns->set_mctrl) 721 721 atmel_pops.set_mctrl = fns->set_mctrl; 722 - at91_open = fns->open; 723 - at91_close = fns->close; 722 + atmel_open_hook = fns->open; 723 + atmel_close_hook = fns->close; 724 724 atmel_pops.pm = fns->pm; 725 725 atmel_pops.set_wake = fns->set_wake; 726 726 }
+3 -3
include/asm-arm/mach/serial_at91.h
··· 14 14 * This is a temporary structure for registering these 15 15 * functions; it is intended to be discarded after boot. 16 16 */ 17 - struct at91_port_fns { 17 + struct atmel_port_fns { 18 18 void (*set_mctrl)(struct uart_port *, u_int); 19 19 u_int (*get_mctrl)(struct uart_port *); 20 20 void (*enable_ms)(struct uart_port *); ··· 25 25 }; 26 26 27 27 #if defined(CONFIG_SERIAL_ATMEL) 28 - void at91_register_uart_fns(struct at91_port_fns *fns); 28 + void atmel_register_uart_fns(struct atmel_port_fns *fns); 29 29 #else 30 - #define at91_register_uart_fns(fns) do { } while (0) 30 + #define atmel_register_uart_fns(fns) do { } while (0) 31 31 #endif 32 32 33 33
+3 -3
include/asm-avr32/mach/serial_at91.h
··· 14 14 * This is a temporary structure for registering these 15 15 * functions; it is intended to be discarded after boot. 16 16 */ 17 - struct at91_port_fns { 17 + struct atmel_port_fns { 18 18 void (*set_mctrl)(struct uart_port *, u_int); 19 19 u_int (*get_mctrl)(struct uart_port *); 20 20 void (*enable_ms)(struct uart_port *); ··· 25 25 }; 26 26 27 27 #if defined(CONFIG_SERIAL_ATMEL) 28 - void at91_register_uart_fns(struct at91_port_fns *fns); 28 + void atmel_register_uart_fns(struct atmel_port_fns *fns); 29 29 #else 30 - #define at91_register_uart_fns(fns) do { } while (0) 30 + #define atmel_register_uart_fns(fns) do { } while (0) 31 31 #endif 32 32 33 33