Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9607ecc authored Oct 13, 2008 by Mike Frysinger Committed by Linus Torvalds Oct 13, 2008

Blackfin Serial Driver: move common variables out of serial headers and into the serial driver



move common variables out of serial headers and into the serial driver and
rename "nr_ports" to "nr_active_ports" so as to easily differentiate
between BFIN_UART_NR_PORTS (the # of available) and nr_ports (the # of enabled)

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent d273e201

arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
	bfin_write16(uart->port.membase + OFFSET_LSR, -1);		bfin_write16(uart->port.membase + OFFSET_LSR, -1);
	}		}

	struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
	struct bfin_serial_res {		struct bfin_serial_res {
	unsigned long uart_base_addr;		unsigned long uart_base_addr;
	int uart_irq;		int uart_irq;
	@@ -164,8 +163,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
	#endif		#endif
	};		};

	int nr_ports = ARRAY_SIZE(bfin_serial_resource);

	#define DRIVER_NAME "bfin-uart"		#define DRIVER_NAME "bfin-uart"

	static void bfin_serial_hw_init(struct bfin_serial_port *uart)		static void bfin_serial_hw_init(struct bfin_serial_port *uart)

arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
	bfin_write16(uart->port.membase + OFFSET_LSR, -1);		bfin_write16(uart->port.membase + OFFSET_LSR, -1);
	}		}

	struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
	struct bfin_serial_res {		struct bfin_serial_res {
	unsigned long uart_base_addr;		unsigned long uart_base_addr;
	int uart_irq;		int uart_irq;
	@@ -142,7 +141,6 @@ struct bfin_serial_res bfin_serial_resource[] = {

	#define DRIVER_NAME "bfin-uart"		#define DRIVER_NAME "bfin-uart"

	int nr_ports = BFIN_UART_NR_PORTS;
	static void bfin_serial_hw_init(struct bfin_serial_port *uart)		static void bfin_serial_hw_init(struct bfin_serial_port *uart)
	{		{

arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
	bfin_write16(uart->port.membase + OFFSET_LSR, -1);		bfin_write16(uart->port.membase + OFFSET_LSR, -1);
	}		}

	struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
	struct bfin_serial_res {		struct bfin_serial_res {
	unsigned long uart_base_addr;		unsigned long uart_base_addr;
	int uart_irq;		int uart_irq;
	@@ -164,8 +163,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
	#endif		#endif
	};		};

	int nr_ports = ARRAY_SIZE(bfin_serial_resource);

	#define DRIVER_NAME "bfin-uart"		#define DRIVER_NAME "bfin-uart"

	static void bfin_serial_hw_init(struct bfin_serial_port *uart)		static void bfin_serial_hw_init(struct bfin_serial_port *uart)

arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,6 @@ struct bfin_serial_port {
	#endif		#endif
	};		};

	struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
	struct bfin_serial_res {		struct bfin_serial_res {
	unsigned long uart_base_addr;		unsigned long uart_base_addr;
	int uart_irq;		int uart_irq;
	@@ -170,8 +169,6 @@ struct bfin_serial_res bfin_serial_resource[] = {
	#endif		#endif
	};		};

	int nr_ports = ARRAY_SIZE(bfin_serial_resource);

	#define DRIVER_NAME "bfin-uart"		#define DRIVER_NAME "bfin-uart"

	static void bfin_serial_hw_init(struct bfin_serial_port *uart)		static void bfin_serial_hw_init(struct bfin_serial_port *uart)

arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)
	bfin_write16(uart->port.membase + OFFSET_LSR, -1);		bfin_write16(uart->port.membase + OFFSET_LSR, -1);
	}		}

	struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
	struct bfin_serial_res {		struct bfin_serial_res {
	unsigned long uart_base_addr;		unsigned long uart_base_addr;
	int uart_irq;		int uart_irq;
	@@ -142,7 +141,6 @@ struct bfin_serial_res bfin_serial_resource[] = {

	#define DRIVER_NAME "bfin-uart"		#define DRIVER_NAME "bfin-uart"

	int nr_ports = BFIN_UART_NR_PORTS;
	static void bfin_serial_hw_init(struct bfin_serial_port *uart)		static void bfin_serial_hw_init(struct bfin_serial_port *uart)
	{		{