FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary DAHDI_IRQ_HANDLER macro.

Browse Source 
All supported kernels now use the same signature for the IRQ handler.

Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
This commit is contained in:
Shaun Ruffell 2019-01-11 04:43:26 +00:00
parent 02d30ab799
commit cdd6ddd0fd
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dahdi/wcb4xxp/base.c
View File

@ -2963,7 +2963,7 @@ static void init_spans(struct b4xxp *b4)
static void b4xxp_bottom_half(unsigned long data); static void b4xxp_bottom_half(unsigned long data);
/* top-half interrupt handler */ /* top-half interrupt handler */
DAHDI_IRQ_HANDLER(b4xxp_interrupt) static irqreturn_t b4xxp_interrupt(int irq, void *dev_id)
{ {
struct b4xxp *b4 = dev_id; struct b4xxp *b4 = dev_id;
unsigned char status; unsigned char status;

4
drivers/dahdi/wct4xxp/base.c
View File

@ -3941,7 +3941,7 @@ static irqreturn_t _t4_interrupt(int irq, void *dev_id)
return IRQ_RETVAL(1); return IRQ_RETVAL(1);
} }
DAHDI_IRQ_HANDLER(t4_interrupt) static irqreturn_t t4_interrupt(int irq, void *dev_id)
{ {
irqreturn_t ret; irqreturn_t ret;
unsigned long flags; unsigned long flags;
@ -4263,7 +4263,7 @@ out:
return IRQ_RETVAL(1); return IRQ_RETVAL(1);
} }
DAHDI_IRQ_HANDLER(t4_interrupt_gen2) static irqreturn_t t4_interrupt_gen2(int irq, void *dev_id)
{ {
irqreturn_t ret; irqreturn_t ret;
unsigned long flags; unsigned long flags;

2
drivers/dahdi/wctc4xxp/base.c
View File

@ -2731,7 +2731,7 @@ static void deferred_work_func(struct work_struct *work)
service_rx_ring(wc); service_rx_ring(wc);
} }
DAHDI_IRQ_HANDLER(wctc4xxp_interrupt) static irqreturn_t wctc4xxp_interrupt(int irq, void *dev_id)
{ {
struct wcdte *wc = dev_id; struct wcdte *wc = dev_id;
bool packets_to_process = false; bool packets_to_process = false;

2
drivers/dahdi/wcxb.c
View File

@ -478,7 +478,7 @@ static irqreturn_t _wcxb_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
DAHDI_IRQ_HANDLER(wcxb_isr) static irqreturn_t wcxb_isr(int irq, void *dev_id)
{ {
irqreturn_t ret; irqreturn_t ret;
unsigned long flags; unsigned long flags;

2
include/dahdi/kernel.h
View File

@ -60,8 +60,6 @@
#define dahdi_pci_module pci_register_driver #define dahdi_pci_module pci_register_driver
#define DAHDI_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
#endif #endif