Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14126
b: refs/heads/master
c: fd8c597
h: refs/heads/master
v: v3
  • Loading branch information
Ralf Baechle authored and Russell King committed Nov 12, 2005
1 parent b35dbeb commit 229c689
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5c8c755ce508a9d41d8a8d80fff387cb4e2929fc
refs/heads/master: fd8c597214f868df7c0055c54e27baaae8df9e70
44 changes: 22 additions & 22 deletions trunk/drivers/serial/dz.c
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/*
* dz.c: Serial port driver for DECStations equiped
* dz.c: Serial port driver for DECStations equiped
* with the DZ chipset.
*
* Copyright (C) 1998 Olivier A. D. Lebaillif
*
* Copyright (C) 1998 Olivier A. D. Lebaillif
*
* Email: olivier.lebaillif@ifrsys.com
*
* [31-AUG-98] triemer
* Changed IRQ to use Harald's dec internals interrupts.h
* removed base_addr code - moving address assignment to setup.c
* Changed name of dz_init to rs_init to be consistent with tc code
* [13-NOV-98] triemer fixed code to receive characters
* after patches by harald to irq code.
* after patches by harald to irq code.
* [09-JAN-99] triemer minor fix for schedule - due to removal of timeout
* field from "current" - somewhere between 2.1.121 and 2.1.131
Qua Jun 27 15:02:26 BRT 2001
* [27-JUN-2001] Arnaldo Carvalho de Melo <acme@conectiva.com.br> - cleanups
*
* Parts (C) 1999 David Airlie, airlied@linux.ie
* [07-SEP-99] Bugfixes
*
* Parts (C) 1999 David Airlie, airlied@linux.ie
* [07-SEP-99] Bugfixes
*
* [06-Jan-2002] Russell King <rmk@arm.linux.org.uk>
* Converted to new serial core
Expand Down Expand Up @@ -64,7 +64,7 @@ static struct dz_port dz_ports[DZ_NB_PORT];

#ifdef DEBUG_DZ
/*
* debugging code to send out chars via prom
* debugging code to send out chars via prom
*/
static void debug_console(const char *s, int count)
{
Expand All @@ -82,7 +82,7 @@ static void debug_console(const char *s, int count)
* ------------------------------------------------------------
* dz_in () and dz_out ()
*
* These routines are used to access the registers of the DZ
* These routines are used to access the registers of the DZ
* chip, hiding relocation differences between implementation.
* ------------------------------------------------------------
*/
Expand All @@ -106,8 +106,8 @@ static inline void dz_out(struct dz_port *dport, unsigned offset,
* ------------------------------------------------------------
* rs_stop () and rs_start ()
*
* These routines are called before setting or resetting
* tty->stopped. They enable or disable transmitter interrupts,
* These routines are called before setting or resetting
* tty->stopped. They enable or disable transmitter interrupts,
* as necessary.
* ------------------------------------------------------------
*/
Expand Down Expand Up @@ -156,17 +156,17 @@ static void dz_enable_ms(struct uart_port *port)

/*
* ------------------------------------------------------------
* Here starts the interrupt handling routines. All of the
* following subroutines are declared as inline and are folded
* into dz_interrupt. They were separated out for readability's
* sake.
* Here starts the interrupt handling routines. All of the
* following subroutines are declared as inline and are folded
* into dz_interrupt. They were separated out for readability's
* sake.
*
* Note: rs_interrupt() is a "fast" interrupt, which means that it
* runs with interrupts turned off. People who may want to modify
* rs_interrupt() should try to keep the interrupt handler as fast as
* possible. After you are done making modifications, it is not a bad
* idea to do:
*
*
* make drivers/serial/dz.s
*
* and look at the resulting assemble code in dz.s.
Expand Down Expand Up @@ -403,7 +403,7 @@ static void dz_set_mctrl(struct uart_port *uport, unsigned int mctrl)
* startup ()
*
* various initialization tasks
* -------------------------------------------------------------------
* -------------------------------------------------------------------
*/
static int dz_startup(struct uart_port *uport)
{
Expand All @@ -430,13 +430,13 @@ static int dz_startup(struct uart_port *uport)
return 0;
}

/*
/*
* -------------------------------------------------------------------
* shutdown ()
*
* This routine will shutdown a serial port; interrupts are disabled, and
* DTR is dropped if the hangup on close termio flag is on.
* -------------------------------------------------------------------
* -------------------------------------------------------------------
*/
static void dz_shutdown(struct uart_port *uport)
{
Expand All @@ -451,7 +451,7 @@ static void dz_shutdown(struct uart_port *uport)
* release the bus after transmitting. This must be done when
* the transmit shift register is empty, not be done when the
* transmit holding register is empty. This functionality
* allows an RS485 driver to be written in user space.
* allows an RS485 driver to be written in user space.
*/
static unsigned int dz_tx_empty(struct uart_port *uport)
{
Expand Down Expand Up @@ -695,13 +695,13 @@ static void dz_console_put_char(struct dz_port *dport, unsigned char ch)

spin_unlock_irqrestore(&dport->port.lock, flags);
}
/*
/*
* -------------------------------------------------------------------
* dz_console_print ()
*
* dz_console_print is registered for printk.
* The console must be locked when we get here.
* -------------------------------------------------------------------
* -------------------------------------------------------------------
*/
static void dz_console_print(struct console *cons,
const char *str,
Expand Down

0 comments on commit 229c689

Please sign in to comment.