From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 31 Aug 2012 19:41:31 +0000 (+0100)
Subject: staging: comedi: das08: Remove pc104 bustype value
X-Git-Tag: v3.7-rc1~173^2~814
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4865a47fc3f460c3be52e83a8c85af1381aec19f;p=~emulex%2Finfiniband.git

staging: comedi: das08: Remove pc104 bustype value

Remove the `pc104` value from `enum das08_bustype` and replace
occurrences of it in the code and data with the `isa` value.  The code
treats them as equivalent anyway with expressions like
`(thisboard->bustype == isa || thisboard->bustype == pc104)`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index 67a914a10b5..33279dc1430 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/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/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h
index 27b6d4ec903..f80913e2c41 100644
--- a/drivers/staging/comedi/drivers/das08.h
+++ b/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,