Commit aa1b2cb3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: icp_multi: remove have_irq from boardinfo

The board supported by this driver always supports interrupts.
Remove the boardinfo.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22d5ab02
...@@ -122,7 +122,6 @@ static unsigned short pci_list_builded; /*>0 list of card is known */ ...@@ -122,7 +122,6 @@ static unsigned short pci_list_builded; /*>0 list of card is known */
struct boardtype { struct boardtype {
const char *name; /* driver name */ const char *name; /* driver name */
int device_id; int device_id;
char have_irq; /* 1=card support IRQ */
}; };
struct icp_multi_private { struct icp_multi_private {
...@@ -767,7 +766,6 @@ static int icp_multi_attach(struct comedi_device *dev, ...@@ -767,7 +766,6 @@ static int icp_multi_attach(struct comedi_device *dev,
icp_multi_reset(dev); icp_multi_reset(dev);
if (this_board->have_irq) {
if (irq) { if (irq) {
if (request_irq(irq, interrupt_service_icp_multi, if (request_irq(irq, interrupt_service_icp_multi,
IRQF_SHARED, "Inova Icp Multi", dev)) { IRQF_SHARED, "Inova Icp Multi", dev)) {
...@@ -779,8 +777,6 @@ static int icp_multi_attach(struct comedi_device *dev, ...@@ -779,8 +777,6 @@ static int icp_multi_attach(struct comedi_device *dev,
printk(KERN_WARNING ", irq=%u", irq); printk(KERN_WARNING ", irq=%u", irq);
} else } else
printk(KERN_WARNING ", IRQ disabled"); printk(KERN_WARNING ", IRQ disabled");
} else
irq = 0;
dev->irq = irq; dev->irq = irq;
...@@ -868,7 +864,6 @@ static const struct boardtype boardtypes[] = { ...@@ -868,7 +864,6 @@ static const struct boardtype boardtypes[] = {
{ {
.name = "icp_multi", .name = "icp_multi",
.device_id = PCI_DEVICE_ID_ICP_MULTI, .device_id = PCI_DEVICE_ID_ICP_MULTI,
.have_irq = 1,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment