diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-11 13:49:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 14:03:16 -0700 |
| commit | aa1b2cb3c5930bb332d756bd566771dcc83f251b (patch) | |
| tree | 16b71464f3fd2a8eb3826c39eb7d25e1d2bcd5e8 /drivers/staging/comedi/drivers/icp_multi.c | |
| parent | 22d5ab0201f2621ebe834f309cb94d712427e62c (diff) | |
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/icp_multi.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/icp_multi.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 0fdab8db03d9..36336c1a3cfa 100644 --- 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, }, }; |