git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: convert /proc/net/rt_acct to seq_file
[safe/jmp/linux-2.6]
/
drivers
/
serial
/
amba-pl010.c
diff --git
a/drivers/serial/amba-pl010.c
b/drivers/serial/amba-pl010.c
index
7156268
..
429a8ae
100644
(file)
--- a/
drivers/serial/amba-pl010.c
+++ b/
drivers/serial/amba-pl010.c
@@
-117,7
+117,7
@@
static void pl010_enable_ms(struct uart_port *port)
static void pl010_rx_chars(struct uart_amba_port *uap)
{
static void pl010_rx_chars(struct uart_amba_port *uap)
{
- struct tty_struct *tty = uap->port.
info
->port.tty;
+ struct tty_struct *tty = uap->port.
state
->port.tty;
unsigned int status, ch, flag, rsr, max_count = 256;
status = readb(uap->port.membase + UART01x_FR);
unsigned int status, ch, flag, rsr, max_count = 256;
status = readb(uap->port.membase + UART01x_FR);
@@
-172,7
+172,7
@@
static void pl010_rx_chars(struct uart_amba_port *uap)
static void pl010_tx_chars(struct uart_amba_port *uap)
{
static void pl010_tx_chars(struct uart_amba_port *uap)
{
- struct circ_buf *xmit = &uap->port.
info
->xmit;
+ struct circ_buf *xmit = &uap->port.
state
->xmit;
int count;
if (uap->port.x_char) {
int count;
if (uap->port.x_char) {
@@
-225,7
+225,7
@@
static void pl010_modem_status(struct uart_amba_port *uap)
if (delta & UART01x_FR_CTS)
uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
if (delta & UART01x_FR_CTS)
uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
- wake_up_interruptible(&uap->port.
info->
delta_msr_wait);
+ wake_up_interruptible(&uap->port.
state->port.
delta_msr_wait);
}
static irqreturn_t pl010_int(int irq, void *dev_id)
}
static irqreturn_t pl010_int(int irq, void *dev_id)
@@
-665,7
+665,7
@@
static struct uart_driver amba_reg = {
.cons = AMBA_CONSOLE,
};
.cons = AMBA_CONSOLE,
};
-static int pl010_probe(struct amba_device *dev,
vo
id *id)
+static int pl010_probe(struct amba_device *dev,
struct amba_
id *id)
{
struct uart_amba_port *uap;
void __iomem *base;
{
struct uart_amba_port *uap;
void __iomem *base;
@@
-686,13
+686,13
@@
static int pl010_probe(struct amba_device *dev, void *id)
goto out;
}
goto out;
}
- base = ioremap(dev->res.start,
PAGE_SIZE
);
+ base = ioremap(dev->res.start,
resource_size(&dev->res)
);
if (!base) {
ret = -ENOMEM;
goto free;
}
if (!base) {
ret = -ENOMEM;
goto free;
}
- uap->clk = clk_get(&dev->dev,
"UARTCLK"
);
+ uap->clk = clk_get(&dev->dev,
NULL
);
if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk);
goto unmap;
if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk);
goto unmap;