ARM/AVR32: get rid of serial_at91.h
The definitions provided by serial_at91.h are only used by the atmel_serial driver, and the function that uses it is never called from anywhere in the kernel. Therefore, these definitions are unused and/or obsolete, and can be removed. Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Родитель
46000065a6
Коммит
95e629b761
|
@ -1,33 +0,0 @@
|
||||||
/*
|
|
||||||
* arch/arm/include/asm/mach/serial_at91.h
|
|
||||||
*
|
|
||||||
* Based on serial_sa1100.h by Nicolas Pitre
|
|
||||||
*
|
|
||||||
* Copyright (C) 2002 ATMEL Rousset
|
|
||||||
*
|
|
||||||
* Low level machine dependent UART functions.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct uart_port;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is a temporary structure for registering these
|
|
||||||
* functions; it is intended to be discarded after boot.
|
|
||||||
*/
|
|
||||||
struct atmel_port_fns {
|
|
||||||
void (*set_mctrl)(struct uart_port *, u_int);
|
|
||||||
u_int (*get_mctrl)(struct uart_port *);
|
|
||||||
void (*enable_ms)(struct uart_port *);
|
|
||||||
void (*pm)(struct uart_port *, u_int, u_int);
|
|
||||||
int (*set_wake)(struct uart_port *, u_int);
|
|
||||||
int (*open)(struct uart_port *);
|
|
||||||
void (*close)(struct uart_port *);
|
|
||||||
};
|
|
||||||
|
|
||||||
#if defined(CONFIG_SERIAL_ATMEL)
|
|
||||||
void atmel_register_uart_fns(struct atmel_port_fns *fns);
|
|
||||||
#else
|
|
||||||
#define atmel_register_uart_fns(fns) do { } while (0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
/*
|
|
||||||
* linux/include/asm-arm/mach/serial_at91.h
|
|
||||||
*
|
|
||||||
* Based on serial_sa1100.h by Nicolas Pitre
|
|
||||||
*
|
|
||||||
* Copyright (C) 2002 ATMEL Rousset
|
|
||||||
*
|
|
||||||
* Low level machine dependent UART functions.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct uart_port;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is a temporary structure for registering these
|
|
||||||
* functions; it is intended to be discarded after boot.
|
|
||||||
*/
|
|
||||||
struct atmel_port_fns {
|
|
||||||
void (*set_mctrl)(struct uart_port *, u_int);
|
|
||||||
u_int (*get_mctrl)(struct uart_port *);
|
|
||||||
void (*enable_ms)(struct uart_port *);
|
|
||||||
void (*pm)(struct uart_port *, u_int, u_int);
|
|
||||||
int (*set_wake)(struct uart_port *, u_int);
|
|
||||||
int (*open)(struct uart_port *);
|
|
||||||
void (*close)(struct uart_port *);
|
|
||||||
};
|
|
||||||
|
|
||||||
#if defined(CONFIG_SERIAL_ATMEL)
|
|
||||||
void atmel_register_uart_fns(struct atmel_port_fns *fns);
|
|
||||||
#else
|
|
||||||
#define atmel_register_uart_fns(fns) do { } while (0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/ioctls.h>
|
#include <asm/ioctls.h>
|
||||||
|
|
||||||
#include <asm/mach/serial_at91.h>
|
|
||||||
#include <mach/board.h>
|
#include <mach/board.h>
|
||||||
|
|
||||||
#ifdef CONFIG_ARM
|
#ifdef CONFIG_ARM
|
||||||
|
@ -1513,23 +1512,6 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Register board-specific modem-control line handlers.
|
|
||||||
*/
|
|
||||||
void __init atmel_register_uart_fns(struct atmel_port_fns *fns)
|
|
||||||
{
|
|
||||||
if (fns->enable_ms)
|
|
||||||
atmel_pops.enable_ms = fns->enable_ms;
|
|
||||||
if (fns->get_mctrl)
|
|
||||||
atmel_pops.get_mctrl = fns->get_mctrl;
|
|
||||||
if (fns->set_mctrl)
|
|
||||||
atmel_pops.set_mctrl = fns->set_mctrl;
|
|
||||||
atmel_open_hook = fns->open;
|
|
||||||
atmel_close_hook = fns->close;
|
|
||||||
atmel_pops.pm = fns->pm;
|
|
||||||
atmel_pops.set_wake = fns->set_wake;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct platform_device *atmel_default_console_device; /* the serial console device */
|
struct platform_device *atmel_default_console_device; /* the serial console device */
|
||||||
|
|
||||||
#ifdef CONFIG_SERIAL_ATMEL_CONSOLE
|
#ifdef CONFIG_SERIAL_ATMEL_CONSOLE
|
||||||
|
|
Загрузка…
Ссылка в новой задаче