aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <[email protected]>2015-11-13 11:11:04 -0700
committerGreg Kroah-Hartman <[email protected]>2015-12-18 14:56:30 -0800
commit6fa60dd4a46cdb698cbda705015d7425d1a548bc (patch)
tree32a2f90283a348ee96ece71f3aae065cbf45ac88
parent14b93bb6bbf08c5002eddda1af1916e72e542eb8 (diff)
staging: comedi: adv_pci1710: remove 'has_irq' boardinfo
All the boards supported by this driver can use an interrupt. Remove the unnecessary boardinfo. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/comedi/drivers/adv_pci1710.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 45d7f42312ec..032d1d41a139 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -134,7 +134,6 @@ struct boardtype {
const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */
const char *rangecode_ai; /* range codes for programming */
unsigned int is_pci1713:1;
- unsigned int has_irq:1;
unsigned int has_large_fifo:1; /* 4K or 1K FIFO */
unsigned int has_diff_ai:1;
unsigned int has_ao:1;
@@ -148,7 +147,6 @@ static const struct boardtype boardtypes[] = {
.n_aichan = 16,
.rangelist_ai = &range_pci1710_3,
.rangecode_ai = range_codes_pci1710_3,
- .has_irq = 1,
.has_large_fifo = 1,
.has_diff_ai = 1,
.has_ao = 1,
@@ -160,7 +158,6 @@ static const struct boardtype boardtypes[] = {
.n_aichan = 16,
.rangelist_ai = &range_pci1710hg,
.rangecode_ai = range_codes_pci1710hg,
- .has_irq = 1,
.has_large_fifo = 1,
.has_diff_ai = 1,
.has_ao = 1,
@@ -172,7 +169,6 @@ static const struct boardtype boardtypes[] = {
.n_aichan = 16,
.rangelist_ai = &range_pci17x1,
.rangecode_ai = range_codes_pci17x1,
- .has_irq = 1,
.has_ao = 1,
.has_di_do = 1,
.has_counter = 1,
@@ -183,7 +179,6 @@ static const struct boardtype boardtypes[] = {
.rangelist_ai = &range_pci1710_3,
.rangecode_ai = range_codes_pci1710_3,
.is_pci1713 = 1,
- .has_irq = 1,
.has_large_fifo = 1,
.has_diff_ai = 1,
},
@@ -192,7 +187,6 @@ static const struct boardtype boardtypes[] = {
.n_aichan = 16,
.rangelist_ai = &range_pci17x1,
.rangecode_ai = range_codes_pci17x1,
- .has_irq = 1,
.has_di_do = 1,
},
};
@@ -806,7 +800,7 @@ static int pci1710_auto_attach(struct comedi_device *dev,
pci1710_reset(dev);
- if (board->has_irq && pcidev->irq) {
+ if (pcidev->irq) {
ret = request_irq(pcidev->irq, interrupt_service_pci1710,
IRQF_SHARED, dev->board_name, dev);
if (ret == 0)