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

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

This member of the boardinfo is not used by the driver. Remove it.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76212bf3
...@@ -203,7 +203,6 @@ ...@@ -203,7 +203,6 @@
static const struct dio200_board dio200_isa_boards[] = { static const struct dio200_board dio200_isa_boards[] = {
{ {
.name = "pc212e", .name = "pc212e",
.bustype = isa_bustype,
.mainsize = DIO200_IO_SIZE, .mainsize = DIO200_IO_SIZE,
.layout = { .layout = {
.n_subdevs = 6, .n_subdevs = 6,
...@@ -216,7 +215,6 @@ static const struct dio200_board dio200_isa_boards[] = { ...@@ -216,7 +215,6 @@ static const struct dio200_board dio200_isa_boards[] = {
}, },
{ {
.name = "pc214e", .name = "pc214e",
.bustype = isa_bustype,
.mainsize = DIO200_IO_SIZE, .mainsize = DIO200_IO_SIZE,
.layout = { .layout = {
.n_subdevs = 4, .n_subdevs = 4,
...@@ -226,7 +224,6 @@ static const struct dio200_board dio200_isa_boards[] = { ...@@ -226,7 +224,6 @@ static const struct dio200_board dio200_isa_boards[] = {
}, },
{ {
.name = "pc215e", .name = "pc215e",
.bustype = isa_bustype,
.mainsize = DIO200_IO_SIZE, .mainsize = DIO200_IO_SIZE,
.layout = { .layout = {
.n_subdevs = 5, .n_subdevs = 5,
...@@ -238,7 +235,6 @@ static const struct dio200_board dio200_isa_boards[] = { ...@@ -238,7 +235,6 @@ static const struct dio200_board dio200_isa_boards[] = {
}, },
{ {
.name = "pc218e", .name = "pc218e",
.bustype = isa_bustype,
.mainsize = DIO200_IO_SIZE, .mainsize = DIO200_IO_SIZE,
.layout = { .layout = {
.n_subdevs = 7, .n_subdevs = 7,
...@@ -251,7 +247,6 @@ static const struct dio200_board dio200_isa_boards[] = { ...@@ -251,7 +247,6 @@ static const struct dio200_board dio200_isa_boards[] = {
}, },
{ {
.name = "pc272e", .name = "pc272e",
.bustype = isa_bustype,
.mainsize = DIO200_IO_SIZE, .mainsize = DIO200_IO_SIZE,
.layout = { .layout = {
.n_subdevs = 4, .n_subdevs = 4,
......
...@@ -48,12 +48,9 @@ struct dio200_layout { ...@@ -48,12 +48,9 @@ struct dio200_layout {
bool has_enhancements:1; /* has enhanced features */ bool has_enhancements:1; /* has enhanced features */
}; };
enum dio200_bustype { isa_bustype, pci_bustype };
struct dio200_board { struct dio200_board {
const char *name; const char *name;
struct dio200_layout layout; struct dio200_layout layout;
enum dio200_bustype bustype;
unsigned char mainbar; unsigned char mainbar;
unsigned char mainshift; unsigned char mainshift;
unsigned int mainsize; unsigned int mainsize;
......
...@@ -243,7 +243,6 @@ enum dio200_pci_model { ...@@ -243,7 +243,6 @@ enum dio200_pci_model {
static const struct dio200_board dio200_pci_boards[] = { static const struct dio200_board dio200_pci_boards[] = {
[pci215_model] = { [pci215_model] = {
.name = "pci215", .name = "pci215",
.bustype = pci_bustype,
.mainbar = 2, .mainbar = 2,
.mainsize = DIO200_IO_SIZE, .mainsize = DIO200_IO_SIZE,
.layout = { .layout = {
...@@ -256,7 +255,6 @@ static const struct dio200_board dio200_pci_boards[] = { ...@@ -256,7 +255,6 @@ static const struct dio200_board dio200_pci_boards[] = {
}, },
[pci272_model] = { [pci272_model] = {
.name = "pci272", .name = "pci272",
.bustype = pci_bustype,
.mainbar = 2, .mainbar = 2,
.mainsize = DIO200_IO_SIZE, .mainsize = DIO200_IO_SIZE,
.layout = { .layout = {
...@@ -268,7 +266,6 @@ static const struct dio200_board dio200_pci_boards[] = { ...@@ -268,7 +266,6 @@ static const struct dio200_board dio200_pci_boards[] = {
}, },
[pcie215_model] = { [pcie215_model] = {
.name = "pcie215", .name = "pcie215",
.bustype = pci_bustype,
.mainbar = 1, .mainbar = 1,
.mainshift = 3, .mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE, .mainsize = DIO200_PCIE_IO_SIZE,
...@@ -285,7 +282,6 @@ static const struct dio200_board dio200_pci_boards[] = { ...@@ -285,7 +282,6 @@ static const struct dio200_board dio200_pci_boards[] = {
}, },
[pcie236_model] = { [pcie236_model] = {
.name = "pcie236", .name = "pcie236",
.bustype = pci_bustype,
.mainbar = 1, .mainbar = 1,
.mainshift = 3, .mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE, .mainsize = DIO200_PCIE_IO_SIZE,
...@@ -302,7 +298,6 @@ static const struct dio200_board dio200_pci_boards[] = { ...@@ -302,7 +298,6 @@ static const struct dio200_board dio200_pci_boards[] = {
}, },
[pcie296_model] = { [pcie296_model] = {
.name = "pcie296", .name = "pcie296",
.bustype = pci_bustype,
.mainbar = 1, .mainbar = 1,
.mainshift = 3, .mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE, .mainsize = DIO200_PCIE_IO_SIZE,
......
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