Commit f73717fc authored by David S. Miller's avatar David S. Miller

[SERIAL SPARC]: Update for irqreturn_t.

parent a5e103b0
...@@ -290,7 +290,7 @@ static void check_status(struct uart_sunsab_port *up, ...@@ -290,7 +290,7 @@ static void check_status(struct uart_sunsab_port *up,
wake_up_interruptible(&up->port.info->delta_msr_wait); wake_up_interruptible(&up->port.info->delta_msr_wait);
} }
static void sunsab_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t sunsab_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct uart_sunsab_port *up = dev_id; struct uart_sunsab_port *up = dev_id;
union sab82532_irq_status status; union sab82532_irq_status status;
...@@ -339,6 +339,8 @@ static void sunsab_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -339,6 +339,8 @@ static void sunsab_interrupt(int irq, void *dev_id, struct pt_regs *regs)
} }
spin_unlock_irqrestore(&up->port.lock, flags); spin_unlock_irqrestore(&up->port.lock, flags);
return IRQ_HANDLED;
} }
/* port->lock is not held. */ /* port->lock is not held. */
......
...@@ -458,7 +458,7 @@ static _INLINE_ void check_modem_status(struct uart_sunsu_port *up) ...@@ -458,7 +458,7 @@ static _INLINE_ void check_modem_status(struct uart_sunsu_port *up)
wake_up_interruptible(&up->port.info->delta_msr_wait); wake_up_interruptible(&up->port.info->delta_msr_wait);
} }
static void sunsu_serial_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t sunsu_serial_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct uart_sunsu_port *up = dev_id; struct uart_sunsu_port *up = dev_id;
unsigned long flags; unsigned long flags;
...@@ -476,6 +476,8 @@ static void sunsu_serial_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -476,6 +476,8 @@ static void sunsu_serial_interrupt(int irq, void *dev_id, struct pt_regs *regs)
} while (!(serial_in(up, UART_IIR) & UART_IIR_NO_INT)); } while (!(serial_in(up, UART_IIR) & UART_IIR_NO_INT));
spin_unlock_irqrestore(&up->port.lock, flags); spin_unlock_irqrestore(&up->port.lock, flags);
return IRQ_HANDLED;
} }
/* Separate interrupt handling path for keyboard/mouse ports. */ /* Separate interrupt handling path for keyboard/mouse ports. */
...@@ -548,7 +550,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *reg ...@@ -548,7 +550,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *reg
} while (serial_in(up, UART_LSR) & UART_LSR_DR); } while (serial_in(up, UART_LSR) & UART_LSR_DR);
} }
static void sunsu_kbd_ms_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t sunsu_kbd_ms_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct uart_sunsu_port *up = dev_id; struct uart_sunsu_port *up = dev_id;
...@@ -559,6 +561,8 @@ static void sunsu_kbd_ms_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -559,6 +561,8 @@ static void sunsu_kbd_ms_interrupt(int irq, void *dev_id, struct pt_regs *regs)
receive_kbd_ms_chars(up, regs, receive_kbd_ms_chars(up, regs,
(status & UART_LSR_BI) != 0); (status & UART_LSR_BI) != 0);
} }
return IRQ_HANDLED;
} }
static unsigned int sunsu_tx_empty(struct uart_port *port) static unsigned int sunsu_tx_empty(struct uart_port *port)
......
...@@ -539,7 +539,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, ...@@ -539,7 +539,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
ZS_WSYNC(channel); ZS_WSYNC(channel);
} }
static void sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct uart_sunzilog_port *up = dev_id; struct uart_sunzilog_port *up = dev_id;
...@@ -587,6 +587,8 @@ static void sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -587,6 +587,8 @@ static void sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *regs)
up = up->next; up = up->next;
} }
return IRQ_HANDLED;
} }
/* A convenient way to quickly get R0 status. The caller must _not_ hold the /* A convenient way to quickly get R0 status. The caller must _not_ hold the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment