ISDN: cleanup AVM drivers

Remove unnecessary wrappers around irq handlers.

diff --git a/drivers/isdn/hardware/avm/avmcard.h b/drivers/isdn/hardware/avm/avmcard.h
index 85fafd3f69ae723f056b8badde6da95d37921b90..b1fee7188dafc04afded63fc4b79c4034a995715 100644 (file)
--- a/drivers/isdn/hardware/avm/avmcard.h
+++ b/drivers/isdn/hardware/avm/avmcard.h
@@ -549,7 +549,7 @@ void b1_register_appl(struct capi_ctr *ctrl, u16 appl,
 void b1_release_appl(struct capi_ctr *ctrl, u16 appl);
 void b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb);
 void b1_parse_version(avmctrl_info *card);
-void b1_handle_interrupt(avmcard * card);
+void b1_interrupt(int interrupt, void *devptr, struct pt_regs *regs);
 
 int b1ctl_read_proc(char *page, char **start, off_t off,
                        int count, int *eof, struct capi_ctr *ctrl);

diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index 5577b02687a939a09f00a9e1a5a3eb49ea3e215c..8d79462ab3e775a8d4d0578bb0177f6d13bf3f8a 100644 (file)
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -438,8 +438,9 @@ void b1_parse_version(avmctrl_info *cinfo)
 
 /* ------------------------------------------------------------- */
 
-void b1_handle_interrupt(avmcard * card)
+void b1_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
 {
+       avmcard *card = devptr;
        avmctrl_info *cinfo = &card->ctrlinfo[0];
        struct capi_ctr *ctrl = cinfo->capi_ctrl;
        unsigned char b1cmd;
@@ -713,7 +714,7 @@ EXPORT_SYMBOL(b1_release_appl);
 EXPORT_SYMBOL(b1_send_message);
 
 EXPORT_SYMBOL(b1_parse_version);
-EXPORT_SYMBOL(b1_handle_interrupt);
+EXPORT_SYMBOL(b1_interrupt);
 
 EXPORT_SYMBOL(b1ctl_read_proc);
 

diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c
index c731bc3f978c85b86dd7ce2cd16001d70e700a59..67b488e6d628fc560314e280c3de2a6a0e46586c 100644 (file)
--- a/drivers/isdn/hardware/avm/b1isa.c
+++ b/drivers/isdn/hardware/avm/b1isa.c
@@ -34,15 +34,6 @@ MODULE_LICENSE("GPL");
 
 /* ------------------------------------------------------------- */
 
-static void b1isa_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
-{
-       avmcard *card = (avmcard *) devptr;
-
-       b1_handle_interrupt(card);
-}
-
-/* ------------------------------------------------------------- */
-
 static struct capi_driver_interface *di;
 
 /* ------------------------------------------------------------- */
@@ -136,7 +127,7 @@ static int b1isa_add_card(struct capi_driver *driver, struct capicardparams *p)
 
        request_region(p->port, AVMB1_PORTLEN, card->name);
 
-       retval = request_irq(card->irq, b1isa_interrupt, 0, card->name, card);
+       retval = request_irq(card->irq, b1_interrupt, 0, card->name, card);
        if (retval) {
                printk(KERN_ERR "b1isa: unable to get IRQ %d.\n", card->irq);
                release_region(card->port, AVMB1_PORTLEN);

diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c
index 0c08d6d9b61bf50a25e95a8fcd3226b708682f24..bc54e1218df428175148b6b740412a86ab94457c 100644 (file)
--- a/drivers/isdn/hardware/avm/b1pci.c
+++ b/drivers/isdn/hardware/avm/b1pci.c
@@ -46,15 +46,6 @@ static struct capi_driver_interface *di;
 
 /* ------------------------------------------------------------- */
 
-static void b1pci_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
-{
-       avmcard *card = devptr;
-
-       b1_handle_interrupt(card);
-}
-
-/* ------------------------------------------------------------- */
-
 static char *b1pci_procinfo(struct capi_ctr *ctrl)
 {
        avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
@@ -121,7 +112,7 @@ static int b1pci_add_card(struct capi_driver *driver,
        b1_reset(card->port);
        b1_getrevision(card);
        
-       retval = request_irq(card->irq, b1pci_interrupt, SA_SHIRQ, card->name, card);
+       retval = request_irq(card->irq, b1_interrupt, SA_SHIRQ, card->name, card);
        if (retval) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n",
                       driver->name, card->irq);

diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c
index 96c180fb3f0956f59c07d3a030d993b3108c96bd..00315a11f15d65c78db62ade3d96ea9cc612cfc7 100644 (file)
--- a/drivers/isdn/hardware/avm/b1pcmcia.c
+++ b/drivers/isdn/hardware/avm/b1pcmcia.c
@@ -39,15 +39,6 @@ static struct capi_driver_interface *di;
 
 /* ------------------------------------------------------------- */
 
-static void b1pcmcia_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
-{
-       avmcard *card = devptr;
-
-       b1_handle_interrupt(card);
-}
-
-/* ------------------------------------------------------------- */
-
 static void b1pcmcia_remove_ctr(struct capi_ctr *ctrl)
 {
        avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
@@ -120,7 +111,7 @@ static int b1pcmcia_add_card(struct capi_driver *driver,
        b1_reset(card->port);
        b1_getrevision(card);
 
-       retval = request_irq(card->irq, b1pcmcia_interrupt, 0, card->name, card);
+       retval = request_irq(card->irq, b1_interrupt, 0, card->name, card);
        if (retval) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n",
                                driver->name, card->irq);