projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: kill off uart_info
[linux-2.6-block.git]
/
drivers
/
serial
/
nwpserial.c
diff --git
a/drivers/serial/nwpserial.c
b/drivers/serial/nwpserial.c
index 9e150b19d72678d6592a50cb34f6d2da29d899c3..e1ab8ec0a4a64f86326494ee14112da85dc2d69b 100644
(file)
--- a/
drivers/serial/nwpserial.c
+++ b/
drivers/serial/nwpserial.c
@@
-126,7
+126,7
@@
static void nwpserial_config_port(struct uart_port *port, int flags)
static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
{
struct nwpserial_port *up = dev_id;
static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
{
struct nwpserial_port *up = dev_id;
- struct tty_struct *tty = up->port.
info
->port.tty;
+ struct tty_struct *tty = up->port.
state
->port.tty;
irqreturn_t ret;
unsigned int iir;
unsigned char ch;
irqreturn_t ret;
unsigned int iir;
unsigned char ch;
@@
-261,7
+261,7
@@
static void nwpserial_start_tx(struct uart_port *port)
struct nwpserial_port *up;
struct circ_buf *xmit;
up = container_of(port, struct nwpserial_port, port);
struct nwpserial_port *up;
struct circ_buf *xmit;
up = container_of(port, struct nwpserial_port, port);
- xmit = &up->port.
info
->xmit;
+ xmit = &up->port.
state
->xmit;
if (port->x_char) {
nwpserial_putchar(up, up->port.x_char);
if (port->x_char) {
nwpserial_putchar(up, up->port.x_char);