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

tty/serial: atmel: remove atmel_default_console_device handling

atmel_default_console_device was only used by AVR32, in particular
arch/avr32/mach-at32ap/at32ap700x.c which is now gone. Remove it from the
driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Alexandre Belloni and committed by
Greg Kroah-Hartman
274a5ed6 7b08579f

-43
-43
drivers/tty/serial/atmel_serial.c
··· 2443 2443 return 0; 2444 2444 } 2445 2445 2446 - struct platform_device *atmel_default_console_device; /* the serial console device */ 2447 - 2448 2446 #ifdef CONFIG_SERIAL_ATMEL_CONSOLE 2449 2447 static void atmel_console_putchar(struct uart_port *port, int ch) 2450 2448 { ··· 2574 2576 }; 2575 2577 2576 2578 #define ATMEL_CONSOLE_DEVICE (&atmel_console) 2577 - 2578 - /* 2579 - * Early console initialization (before VM subsystem initialized). 2580 - */ 2581 - static int __init atmel_console_init(void) 2582 - { 2583 - int ret; 2584 - if (atmel_default_console_device) { 2585 - struct atmel_uart_data *pdata = 2586 - dev_get_platdata(&atmel_default_console_device->dev); 2587 - int id = pdata->num; 2588 - struct atmel_uart_port *atmel_port = &atmel_ports[id]; 2589 - 2590 - atmel_port->backup_imr = 0; 2591 - atmel_port->uart.line = id; 2592 - 2593 - add_preferred_console(ATMEL_DEVICENAME, id, NULL); 2594 - ret = atmel_init_port(atmel_port, atmel_default_console_device); 2595 - if (ret) 2596 - return ret; 2597 - register_console(&atmel_console); 2598 - } 2599 - 2600 - return 0; 2601 - } 2602 - 2603 - console_initcall(atmel_console_init); 2604 - 2605 - /* 2606 - * Late console initialization. 2607 - */ 2608 - static int __init atmel_late_console_init(void) 2609 - { 2610 - if (atmel_default_console_device 2611 - && !(atmel_console.flags & CON_ENABLED)) 2612 - register_console(&atmel_console); 2613 - 2614 - return 0; 2615 - } 2616 - 2617 - core_initcall(atmel_late_console_init); 2618 2579 2619 2580 static inline bool atmel_is_console_port(struct uart_port *port) 2620 2581 {