From 3e101acb3c152e2fdb96468af050731d8962e7c5 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 1 Jan 2004 19:26:20 +0100 Subject: [PATCH] [Bluetooth] Convert interrupt handlers to use irqreturn_t This patch changes the interrupt routines to make use of the irqreturn_t return values. --- drivers/bluetooth/bluecard_cs.c | 8 +++++--- drivers/bluetooth/bt3c_cs.c | 6 ++++-- drivers/bluetooth/btuart_cs.c | 6 ++++-- drivers/bluetooth/dtl1_cs.c | 6 ++++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index fee12e3828cf6..6de94257b12a6 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c @@ -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; unsigned int iobase; @@ -507,11 +507,11 @@ void bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs) if (!info) { 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))) - return; + return IRQ_NONE; iobase = info->link.io.BasePort1; @@ -556,6 +556,8 @@ void bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs) outb(info->ctrl_reg, iobase + REG_CONTROL); spin_unlock(&(info->lock)); + + return IRQ_HANDLED; } diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index b5a8135f98081..df16aad65de1f 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -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; unsigned int iobase; @@ -363,7 +363,7 @@ void bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs) if (!info) { printk(KERN_WARNING "bt3c_cs: Call of irq %d for unknown device.\n", irq); - return; + return IRQ_NONE; } iobase = info->link.io.BasePort1; @@ -396,6 +396,8 @@ void bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs) } spin_unlock(&(info->lock)); + + return IRQ_HANDLED; } diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 8fb7b29fdc3db..337230b613e2b 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c @@ -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; unsigned int iobase; @@ -310,7 +310,7 @@ void btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs) if (!info) { printk(KERN_WARNING "btuart_cs: Call of irq %d for unknown device.\n", irq); - return; + return IRQ_NONE; } iobase = info->link.io.BasePort1; @@ -351,6 +351,8 @@ void btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs) } spin_unlock(&(info->lock)); + + return IRQ_HANDLED; } diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 96bfe85fdfec8..74d9cf9e352da 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c @@ -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; unsigned int iobase; @@ -314,7 +314,7 @@ void dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs) if (!info) { printk(KERN_WARNING "dtl1_cs: Call of irq %d for unknown device.\n", irq); - return; + return IRQ_NONE; } iobase = info->link.io.BasePort1; @@ -363,6 +363,8 @@ void dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs) } spin_unlock(&(info->lock)); + + return IRQ_HANDLED; } -- 2.53.0