aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2009-04-06 12:32:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-06 17:36:29 -0400
commit59e4e3e65d3f856cfcdc66de2db5530d7b161f68 (patch)
tree4abfb8f0ca123e6df97f4ff7cefe37b418471a73 /drivers/serial
parentf933d3c740b32bdd284c74b2e40e838b585ecf0f (diff)
blackfin: Use unsigned long for flags with irq functions
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/bfin_5xx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index 318d69dce8e1..45c32b23d736 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -415,7 +415,8 @@ static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
415 415
416void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart) 416void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
417{ 417{
418 int x_pos, pos, flags; 418 int x_pos, pos;
419 unsigned long flags;
419 420
420 spin_lock_irqsave(&uart->port.lock, flags); 421 spin_lock_irqsave(&uart->port.lock, flags);
421 422
@@ -1088,7 +1089,7 @@ static void
1088bfin_serial_console_write(struct console *co, const char *s, unsigned int count) 1089bfin_serial_console_write(struct console *co, const char *s, unsigned int count)
1089{ 1090{
1090 struct bfin_serial_port *uart = &bfin_serial_ports[co->index]; 1091 struct bfin_serial_port *uart = &bfin_serial_ports[co->index];
1091 int flags = 0; 1092 unsigned long flags;
1092 1093
1093 spin_lock_irqsave(&uart->port.lock, flags); 1094 spin_lock_irqsave(&uart->port.lock, flags);
1094 uart_console_write(&uart->port, s, count, bfin_serial_console_putchar); 1095 uart_console_write(&uart->port, s, count, bfin_serial_console_putchar);