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

The 'bustype' in the boardinfo is not used. 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/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 5630be33d4526500025db93ad86217ff21448acc..bb68d8fa83a30bc29b1a59907ffc1947a8bbf092 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -239,7 +239,6 @@ static const struct labpc_boardinfo labpc_boards[] = {
        {
                .name                   = "lab-pc-1200",
                .ai_speed               = 10000,
-               .bustype                = isa_bustype,
                .register_layout        = labpc_1200_layout,
                .has_ao                 = 1,
                .ai_range_table         = &range_labpc_1200_ai,
@@ -248,7 +247,6 @@ static const struct labpc_boardinfo labpc_boards[] = {
        }, {
                .name                   = "lab-pc-1200ai",
                .ai_speed               = 10000,
-               .bustype                = isa_bustype,
                .register_layout        = labpc_1200_layout,
                .ai_range_table         = &range_labpc_1200_ai,
                .ai_range_code          = labpc_1200_ai_gain_bits,
@@ -256,7 +254,6 @@ static const struct labpc_boardinfo labpc_boards[] = {
        }, {
                .name                   = "lab-pc+",
                .ai_speed               = 12000,
-               .bustype                = isa_bustype,
                .register_layout        = labpc_plus_layout,
                .has_ao                 = 1,
                .ai_range_table         = &range_labpc_plus_ai,

diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h
index 9f126605f249fa9681076f87c4d76a7fecf0b734..615f16f271c0a8078a1a6a22339393ffdeddf2ed 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.h
+++ b/drivers/staging/comedi/drivers/ni_labpc.h
@@ -27,7 +27,6 @@
 #define EEPROM_SIZE    256     /*  256 byte eeprom */
 #define NUM_AO_CHAN    2       /*  boards have two analog output channels */
 
-enum labpc_bustype { isa_bustype, pci_bustype, pcmcia_bustype };
 enum labpc_register_layout { labpc_plus_layout, labpc_1200_layout };
 enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,
        isa_dma_transfer
@@ -37,7 +36,6 @@ struct labpc_boardinfo {
        const char *name;
        int device_id;          /*  device id for pci and pcmcia boards */
        int ai_speed;           /*  maximum input speed in nanoseconds */
-       enum labpc_bustype bustype;     /*  ISA/PCI/etc. */
 
        /*  1200 has extra registers compared to pc+ */
        enum labpc_register_layout register_layout;

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 1f4b7630ed95575082a0cce66ac8b2a1b3f6b9b9..9e3737c6918dc4e94d2b1d63ae2210ddc7d4a862 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -78,7 +78,6 @@ static const struct labpc_boardinfo labpc_cs_boards[] = {
                .name                   = "daqcard-1200",
                .device_id              = 0x103,
                .ai_speed               = 10000,
-               .bustype                = pcmcia_bustype,
                .register_layout        = labpc_1200_layout,
                .has_ao                 = 1,
                .ai_range_table         = &range_labpc_1200_ai,

diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c
index 4beadfeabf8737f51353dffadd725986e3f18952..8e916f86cceadd21877b994a101680eea6f525ec 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_pci.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c
@@ -50,7 +50,6 @@ static const struct labpc_boardinfo labpc_pci_boards[] = {
        [BOARD_NI_PCI1200] = {
                .name                   = "ni_pci-1200",
                .ai_speed               = 10000,
-               .bustype                = pci_bustype,
                .register_layout        = labpc_1200_layout,
                .has_ao                 = 1,
                .ai_range_table         = &range_labpc_1200_ai,