staging: comedi: icp_multi: remove have_irq from boardinfo

The board supported by this driver always supports interrupts.
Remove the boardinfo.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 0fdab8db03d9e3af3649ad8356f4fada10834c89..36336c1a3cfa6b30e0bcfc4a419bc52d9d8f2161 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -122,7 +122,6 @@ static unsigned short pci_list_builded;     /*>0 list of card is known */
 struct boardtype {
        const char *name;       /*  driver name */
        int device_id;
-       char have_irq;          /*  1=card support IRQ */
 };
 
 struct icp_multi_private {
@@ -767,20 +766,17 @@ static int icp_multi_attach(struct comedi_device *dev,
 
        icp_multi_reset(dev);
 
-       if (this_board->have_irq) {
-               if (irq) {
-                       if (request_irq(irq, interrupt_service_icp_multi,
-                                       IRQF_SHARED, "Inova Icp Multi", dev)) {
-                               printk(KERN_WARNING
-                                   "unable to allocate IRQ %u, DISABLING IT",
-                                    irq);
-                               irq = 0;        /* Can't use IRQ */
-                       } else
-                               printk(KERN_WARNING ", irq=%u", irq);
+       if (irq) {
+               if (request_irq(irq, interrupt_service_icp_multi,
+                               IRQF_SHARED, "Inova Icp Multi", dev)) {
+                       printk(KERN_WARNING
+                               "unable to allocate IRQ %u, DISABLING IT",
+                               irq);
+                       irq = 0;        /* Can't use IRQ */
                } else
-                       printk(KERN_WARNING ", IRQ disabled");
+                       printk(KERN_WARNING ", irq=%u", irq);
        } else
-               irq = 0;
+               printk(KERN_WARNING ", IRQ disabled");
 
        dev->irq = irq;
 
@@ -868,7 +864,6 @@ static const struct boardtype boardtypes[] = {
        {
                .name           = "icp_multi",
                .device_id      = PCI_DEVICE_ID_ICP_MULTI,
-               .have_irq       = 1,
        },
 };