From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 1 Aug 2014 20:07:00 +0000 (-0700)
Subject: staging: comedi: amplc_dio200: remove 'bustype' from boardinfo
X-Git-Tag: v3.18-rc1~130^2~1374
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=7560e527534570199382ac72278301e9ac82920e;p=cascardo%2Flinux.git

staging: comedi: amplc_dio200: remove 'bustype' from boardinfo

This member of the boardinfo is not used by the driver. Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index d605fd95cc50..f0adead92ba7 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -203,7 +203,6 @@
 static const struct dio200_board dio200_isa_boards[] = {
 	{
 		.name = "pc212e",
-		.bustype = isa_bustype,
 		.mainsize = DIO200_IO_SIZE,
 		.layout = {
 			.n_subdevs = 6,
@@ -216,7 +215,6 @@ static const struct dio200_board dio200_isa_boards[] = {
 	},
 	{
 		.name = "pc214e",
-		.bustype = isa_bustype,
 		.mainsize = DIO200_IO_SIZE,
 		.layout = {
 			.n_subdevs = 4,
@@ -226,7 +224,6 @@ static const struct dio200_board dio200_isa_boards[] = {
 	},
 	{
 		.name = "pc215e",
-		.bustype = isa_bustype,
 		.mainsize = DIO200_IO_SIZE,
 		.layout = {
 			.n_subdevs = 5,
@@ -238,7 +235,6 @@ static const struct dio200_board dio200_isa_boards[] = {
 	},
 	{
 		.name = "pc218e",
-		.bustype = isa_bustype,
 		.mainsize = DIO200_IO_SIZE,
 		.layout = {
 			.n_subdevs = 7,
@@ -251,7 +247,6 @@ static const struct dio200_board dio200_isa_boards[] = {
 	},
 	{
 		.name = "pc272e",
-		.bustype = isa_bustype,
 		.mainsize = DIO200_IO_SIZE,
 		.layout = {
 			.n_subdevs = 4,
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.h b/drivers/staging/comedi/drivers/amplc_dio200.h
index b21ed526a960..226ce8438ad1 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.h
+++ b/drivers/staging/comedi/drivers/amplc_dio200.h
@@ -48,12 +48,9 @@ struct dio200_layout {
 	bool has_enhancements:1;	/* has enhanced features */
 };
 
-enum dio200_bustype { isa_bustype, pci_bustype };
-
 struct dio200_board {
 	const char *name;
 	struct dio200_layout layout;
-	enum dio200_bustype bustype;
 	unsigned char mainbar;
 	unsigned char mainshift;
 	unsigned int mainsize;
diff --git a/drivers/staging/comedi/drivers/amplc_dio200_pci.c b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
index f4170f899487..e1e62a3fd419 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200_pci.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
@@ -243,7 +243,6 @@ enum dio200_pci_model {
 static const struct dio200_board dio200_pci_boards[] = {
 	[pci215_model] = {
 		.name = "pci215",
-		.bustype = pci_bustype,
 		.mainbar = 2,
 		.mainsize = DIO200_IO_SIZE,
 		.layout = {
@@ -256,7 +255,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 	},
 	[pci272_model] = {
 		.name = "pci272",
-		.bustype = pci_bustype,
 		.mainbar = 2,
 		.mainsize = DIO200_IO_SIZE,
 		.layout = {
@@ -268,7 +266,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 	},
 	[pcie215_model] = {
 		.name = "pcie215",
-		.bustype = pci_bustype,
 		.mainbar = 1,
 		.mainshift = 3,
 		.mainsize = DIO200_PCIE_IO_SIZE,
@@ -285,7 +282,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 	},
 	[pcie236_model] = {
 		.name = "pcie236",
-		.bustype = pci_bustype,
 		.mainbar = 1,
 		.mainshift = 3,
 		.mainsize = DIO200_PCIE_IO_SIZE,
@@ -302,7 +298,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 	},
 	[pcie296_model] = {
 		.name = "pcie296",
-		.bustype = pci_bustype,
 		.mainbar = 1,
 		.mainshift = 3,
 		.mainsize = DIO200_PCIE_IO_SIZE,