diff options
Diffstat (limited to 'drivers/isdn/hardware')
-rw-r--r-- | drivers/isdn/hardware/avm/avmcard.h | 4 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/b1.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/b1dma.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/c4.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/t1isa.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/eicon/diva.c | 4 | ||||
-rw-r--r-- | drivers/isdn/hardware/eicon/divasmain.c | 3 |
7 files changed, 8 insertions, 11 deletions
diff --git a/drivers/isdn/hardware/avm/avmcard.h b/drivers/isdn/hardware/avm/avmcard.h index 3b431723c7cb..d964f07e4a56 100644 --- a/drivers/isdn/hardware/avm/avmcard.h +++ b/drivers/isdn/hardware/avm/avmcard.h | |||
@@ -554,7 +554,7 @@ void b1_register_appl(struct capi_ctr *ctrl, u16 appl, | |||
554 | void b1_release_appl(struct capi_ctr *ctrl, u16 appl); | 554 | void b1_release_appl(struct capi_ctr *ctrl, u16 appl); |
555 | u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb); | 555 | u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb); |
556 | void b1_parse_version(avmctrl_info *card); | 556 | void b1_parse_version(avmctrl_info *card); |
557 | irqreturn_t b1_interrupt(int interrupt, void *devptr, struct pt_regs *regs); | 557 | irqreturn_t b1_interrupt(int interrupt, void *devptr); |
558 | 558 | ||
559 | int b1ctl_read_proc(char *page, char **start, off_t off, | 559 | int b1ctl_read_proc(char *page, char **start, off_t off, |
560 | int count, int *eof, struct capi_ctr *ctrl); | 560 | int count, int *eof, struct capi_ctr *ctrl); |
@@ -567,7 +567,7 @@ void avmcard_dma_free(avmcard_dmainfo *); | |||
567 | int b1pciv4_detect(avmcard *card); | 567 | int b1pciv4_detect(avmcard *card); |
568 | int t1pci_detect(avmcard *card); | 568 | int t1pci_detect(avmcard *card); |
569 | void b1dma_reset(avmcard *card); | 569 | void b1dma_reset(avmcard *card); |
570 | irqreturn_t b1dma_interrupt(int interrupt, void *devptr, struct pt_regs *regs); | 570 | irqreturn_t b1dma_interrupt(int interrupt, void *devptr); |
571 | 571 | ||
572 | int b1dma_load_firmware(struct capi_ctr *ctrl, capiloaddata *data); | 572 | int b1dma_load_firmware(struct capi_ctr *ctrl, capiloaddata *data); |
573 | void b1dma_reset_ctr(struct capi_ctr *ctrl); | 573 | void b1dma_reset_ctr(struct capi_ctr *ctrl); |
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c index 0c7061d55027..da2729247713 100644 --- a/drivers/isdn/hardware/avm/b1.c +++ b/drivers/isdn/hardware/avm/b1.c | |||
@@ -485,7 +485,7 @@ void b1_parse_version(avmctrl_info *cinfo) | |||
485 | 485 | ||
486 | /* ------------------------------------------------------------- */ | 486 | /* ------------------------------------------------------------- */ |
487 | 487 | ||
488 | irqreturn_t b1_interrupt(int interrupt, void *devptr, struct pt_regs *regs) | 488 | irqreturn_t b1_interrupt(int interrupt, void *devptr) |
489 | { | 489 | { |
490 | avmcard *card = devptr; | 490 | avmcard *card = devptr; |
491 | avmctrl_info *cinfo = &card->ctrlinfo[0]; | 491 | avmctrl_info *cinfo = &card->ctrlinfo[0]; |
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c index a4beeb46c859..ddd47cdfdb1f 100644 --- a/drivers/isdn/hardware/avm/b1dma.c +++ b/drivers/isdn/hardware/avm/b1dma.c | |||
@@ -628,7 +628,7 @@ static void b1dma_handle_interrupt(avmcard *card) | |||
628 | spin_unlock(&card->lock); | 628 | spin_unlock(&card->lock); |
629 | } | 629 | } |
630 | 630 | ||
631 | irqreturn_t b1dma_interrupt(int interrupt, void *devptr, struct pt_regs *regs) | 631 | irqreturn_t b1dma_interrupt(int interrupt, void *devptr) |
632 | { | 632 | { |
633 | avmcard *card = devptr; | 633 | avmcard *card = devptr; |
634 | 634 | ||
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c index 6c3d5f5f1f4b..2a3eb38f0ebb 100644 --- a/drivers/isdn/hardware/avm/c4.c +++ b/drivers/isdn/hardware/avm/c4.c | |||
@@ -713,7 +713,7 @@ static irqreturn_t c4_handle_interrupt(avmcard *card) | |||
713 | return IRQ_HANDLED; | 713 | return IRQ_HANDLED; |
714 | } | 714 | } |
715 | 715 | ||
716 | static irqreturn_t c4_interrupt(int interrupt, void *devptr, struct pt_regs *regs) | 716 | static irqreturn_t c4_interrupt(int interrupt, void *devptr) |
717 | { | 717 | { |
718 | avmcard *card = devptr; | 718 | avmcard *card = devptr; |
719 | 719 | ||
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c index 5a2f854d55b5..e47c60b0a8ec 100644 --- a/drivers/isdn/hardware/avm/t1isa.c +++ b/drivers/isdn/hardware/avm/t1isa.c | |||
@@ -131,7 +131,7 @@ static int t1_detectandinit(unsigned int base, unsigned irq, int cardnr) | |||
131 | return 0; | 131 | return 0; |
132 | } | 132 | } |
133 | 133 | ||
134 | static irqreturn_t t1isa_interrupt(int interrupt, void *devptr, struct pt_regs *regs) | 134 | static irqreturn_t t1isa_interrupt(int interrupt, void *devptr) |
135 | { | 135 | { |
136 | avmcard *card = devptr; | 136 | avmcard *card = devptr; |
137 | avmctrl_info *cinfo = &card->ctrlinfo[0]; | 137 | avmctrl_info *cinfo = &card->ctrlinfo[0]; |
diff --git a/drivers/isdn/hardware/eicon/diva.c b/drivers/isdn/hardware/eicon/diva.c index 8ab8027f33c0..ffa2afa77c2f 100644 --- a/drivers/isdn/hardware/eicon/diva.c +++ b/drivers/isdn/hardware/eicon/diva.c | |||
@@ -71,8 +71,6 @@ DivaIdiReqFunc(29) | |||
71 | DivaIdiReqFunc(30) | 71 | DivaIdiReqFunc(30) |
72 | DivaIdiReqFunc(31) | 72 | DivaIdiReqFunc(31) |
73 | 73 | ||
74 | struct pt_regs; | ||
75 | |||
76 | /* | 74 | /* |
77 | ** LOCALS | 75 | ** LOCALS |
78 | */ | 76 | */ |
@@ -515,7 +513,7 @@ diva_xdi_read(void *adapter, void *os_handle, void __user *dst, | |||
515 | } | 513 | } |
516 | 514 | ||
517 | 515 | ||
518 | irqreturn_t diva_os_irq_wrapper(int irq, void *context, struct pt_regs *regs) | 516 | irqreturn_t diva_os_irq_wrapper(int irq, void *context) |
519 | { | 517 | { |
520 | diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) context; | 518 | diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) context; |
521 | diva_xdi_clear_interrupts_proc_t clear_int_proc; | 519 | diva_xdi_clear_interrupts_proc_t clear_int_proc; |
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index b7dadba13e82..dae2e83dd5e8 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c | |||
@@ -58,8 +58,7 @@ static char *DRIVERLNAME = "divas"; | |||
58 | static char *DEVNAME = "Divas"; | 58 | static char *DEVNAME = "Divas"; |
59 | char *DRIVERRELEASE_DIVAS = "2.0"; | 59 | char *DRIVERRELEASE_DIVAS = "2.0"; |
60 | 60 | ||
61 | extern irqreturn_t diva_os_irq_wrapper(int irq, void *context, | 61 | extern irqreturn_t diva_os_irq_wrapper(int irq, void *context); |
62 | struct pt_regs *regs); | ||
63 | extern int create_divas_proc(void); | 62 | extern int create_divas_proc(void); |
64 | extern void remove_divas_proc(void); | 63 | extern void remove_divas_proc(void); |
65 | extern void diva_get_vserial_number(PISDN_ADAPTER IoAdapter, char *buf); | 64 | extern void diva_get_vserial_number(PISDN_ADAPTER IoAdapter, char *buf); |