Commit 3e101acb authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Marcel Holtmann

[Bluetooth] Convert interrupt handlers to use irqreturn_t

This patch changes the interrupt routines to make use of the
irqreturn_t return values.
parent e89502bf
...@@ -499,7 +499,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) ...@@ -499,7 +499,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset)
} }
void bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs) static irqreturn_t bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
{ {
bluecard_info_t *info = dev_inst; bluecard_info_t *info = dev_inst;
unsigned int iobase; unsigned int iobase;
...@@ -507,11 +507,11 @@ void bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -507,11 +507,11 @@ void bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
if (!info) { if (!info) {
printk(KERN_WARNING "bluecard_cs: Call of irq %d for unknown device.\n", irq); printk(KERN_WARNING "bluecard_cs: Call of irq %d for unknown device.\n", irq);
return; return IRQ_NONE;
} }
if (!test_bit(CARD_READY, &(info->hw_state))) if (!test_bit(CARD_READY, &(info->hw_state)))
return; return IRQ_NONE;
iobase = info->link.io.BasePort1; iobase = info->link.io.BasePort1;
...@@ -556,6 +556,8 @@ void bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -556,6 +556,8 @@ void bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
outb(info->ctrl_reg, iobase + REG_CONTROL); outb(info->ctrl_reg, iobase + REG_CONTROL);
spin_unlock(&(info->lock)); spin_unlock(&(info->lock));
return IRQ_HANDLED;
} }
......
...@@ -355,7 +355,7 @@ static void bt3c_receive(bt3c_info_t *info) ...@@ -355,7 +355,7 @@ static void bt3c_receive(bt3c_info_t *info)
} }
void bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs) static irqreturn_t bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
{ {
bt3c_info_t *info = dev_inst; bt3c_info_t *info = dev_inst;
unsigned int iobase; unsigned int iobase;
...@@ -363,7 +363,7 @@ void bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -363,7 +363,7 @@ void bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
if (!info) { if (!info) {
printk(KERN_WARNING "bt3c_cs: Call of irq %d for unknown device.\n", irq); printk(KERN_WARNING "bt3c_cs: Call of irq %d for unknown device.\n", irq);
return; return IRQ_NONE;
} }
iobase = info->link.io.BasePort1; iobase = info->link.io.BasePort1;
...@@ -396,6 +396,8 @@ void bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -396,6 +396,8 @@ void bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
} }
spin_unlock(&(info->lock)); spin_unlock(&(info->lock));
return IRQ_HANDLED;
} }
......
...@@ -301,7 +301,7 @@ static void btuart_receive(btuart_info_t *info) ...@@ -301,7 +301,7 @@ static void btuart_receive(btuart_info_t *info)
} }
void btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs) static irqreturn_t btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
{ {
btuart_info_t *info = dev_inst; btuart_info_t *info = dev_inst;
unsigned int iobase; unsigned int iobase;
...@@ -310,7 +310,7 @@ void btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -310,7 +310,7 @@ void btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
if (!info) { if (!info) {
printk(KERN_WARNING "btuart_cs: Call of irq %d for unknown device.\n", irq); printk(KERN_WARNING "btuart_cs: Call of irq %d for unknown device.\n", irq);
return; return IRQ_NONE;
} }
iobase = info->link.io.BasePort1; iobase = info->link.io.BasePort1;
...@@ -351,6 +351,8 @@ void btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -351,6 +351,8 @@ void btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
} }
spin_unlock(&(info->lock)); spin_unlock(&(info->lock));
return IRQ_HANDLED;
} }
......
...@@ -304,7 +304,7 @@ static void dtl1_receive(dtl1_info_t *info) ...@@ -304,7 +304,7 @@ static void dtl1_receive(dtl1_info_t *info)
} }
void dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs) static irqreturn_t dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
{ {
dtl1_info_t *info = dev_inst; dtl1_info_t *info = dev_inst;
unsigned int iobase; unsigned int iobase;
...@@ -314,7 +314,7 @@ void dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -314,7 +314,7 @@ void dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
if (!info) { if (!info) {
printk(KERN_WARNING "dtl1_cs: Call of irq %d for unknown device.\n", irq); printk(KERN_WARNING "dtl1_cs: Call of irq %d for unknown device.\n", irq);
return; return IRQ_NONE;
} }
iobase = info->link.io.BasePort1; iobase = info->link.io.BasePort1;
...@@ -363,6 +363,8 @@ void dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs) ...@@ -363,6 +363,8 @@ void dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs)
} }
spin_unlock(&(info->lock)); spin_unlock(&(info->lock));
return IRQ_HANDLED;
} }
......
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