From 7ec3241f1375df69dec02e3eec066972e11e401f Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 31 Aug 2012 20:41:31 +0100 Subject: [PATCH] --- yaml --- r: 324653 b: refs/heads/master c: 4865a47fc3f460c3be52e83a8c85af1381aec19f h: refs/heads/master i: 324651: d0c08946b35954d78f02d498d9a82e12f1aa226c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das08.c | 7 +++---- trunk/drivers/staging/comedi/drivers/das08.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6e832f0cf103..1012264aa8ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c283cf384a7debe3fa421c4f77a375e111e8fcb5 +refs/heads/master: 4865a47fc3f460c3be52e83a8c85af1381aec19f diff --git a/trunk/drivers/staging/comedi/drivers/das08.c b/trunk/drivers/staging/comedi/drivers/das08.c index 67a914a10b55..33279dc1430d 100644 --- a/trunk/drivers/staging/comedi/drivers/das08.c +++ b/trunk/drivers/staging/comedi/drivers/das08.c @@ -635,7 +635,7 @@ static const struct das08_board_struct das08_boards[] = { }, { .name = "pc104-das08", - .bustype = pc104, + .bustype = isa, .ai = das08_ai_rinsn, .ai_nbits = 12, .ai_pg = das08_pg_none, @@ -1004,7 +1004,7 @@ das08_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -EIO; return das08_pci_attach_common(dev, pdev); } else if (IS_ENABLED(CONFIG_COMEDI_DAS08_ISA) && - (thisboard->bustype == isa || thisboard->bustype == pc104)) { + thisboard->bustype == isa) { iobase = it->options[0]; dev_info(dev->class_dev, "iobase 0x%lx\n", iobase); if (!request_region(iobase, thisboard->iosize, DRV_NAME)) { @@ -1029,8 +1029,7 @@ static void __maybe_unused das08_detach(struct comedi_device *dev) struct das08_private_struct *devpriv = dev->private; das08_common_detach(dev); - if (IS_ENABLED(CONFIG_COMEDI_DAS08_ISA) && - (thisboard->bustype == isa || thisboard->bustype == pc104)) { + if (IS_ENABLED(CONFIG_COMEDI_DAS08_ISA) && thisboard->bustype == isa) { if (dev->iobase) release_region(dev->iobase, thisboard->iosize); } else if (IS_ENABLED(CONFIG_COMEDI_DAS08_PCI) && diff --git a/trunk/drivers/staging/comedi/drivers/das08.h b/trunk/drivers/staging/comedi/drivers/das08.h index 27b6d4ec9032..f80913e2c41c 100644 --- a/trunk/drivers/staging/comedi/drivers/das08.h +++ b/trunk/drivers/staging/comedi/drivers/das08.h @@ -24,7 +24,7 @@ #ifndef _DAS08_H #define _DAS08_H -enum das08_bustype { isa, pci, pcmcia, pc104 }; +enum das08_bustype { isa, pci, pcmcia }; /* different ways ai data is encoded in first two registers */ enum das08_ai_encoding { das08_encode12, das08_encode16, das08_pcm_encode12 }; enum das08_lrange { das08_pg_none, das08_bipolar5, das08_pgh, das08_pgl,