staging: comedi: amplc_pc236, amplc_pci236: get rid of bustype

The `bustype` member of `struct pc236_board` variables is initialized,
but never used.  Remove it along with the enumerated constants
associated with it.

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/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index b95b877e5ed3f8867fb38b07a6d56ba2348ef29b..875cc19cb96913ef87949d6758aa8fc69bb13fd3 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -65,7 +65,6 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 static const struct pc236_board pc236_boards[] = {
        {
                .name = "pc36at",
-               .bustype = isa_bustype,
        },
 };
 

diff --git a/drivers/staging/comedi/drivers/amplc_pc236.h b/drivers/staging/comedi/drivers/amplc_pc236.h
index 37348f1d986fb1e2f8e2bc9625294b9a747f2702..91d6d9c065b59d3c3e2832d189e60b2a04e060ed 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc236.h
+++ b/drivers/staging/comedi/drivers/amplc_pc236.h
@@ -25,11 +25,8 @@
 
 struct comedi_device;
 
-enum pc236_bustype { isa_bustype, pci_bustype };
-
 struct pc236_board {
        const char *name;
-       enum pc236_bustype bustype;
        void (*intr_update_cb)(struct comedi_device *dev, bool enable);
        bool (*intr_chk_clr_cb)(struct comedi_device *dev);
 };

diff --git a/drivers/staging/comedi/drivers/amplc_pci236.c b/drivers/staging/comedi/drivers/amplc_pci236.c
index a7e7a6f13394abfb752faa5d5b9372bad55c2279..436aebaf76212702b9640fdf9f755efa0c02f789 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci236.c
+++ b/drivers/staging/comedi/drivers/amplc_pci236.c
@@ -90,7 +90,6 @@ static const struct pc236_board pc236_pci_board = {
        .name = "pci236",
        .intr_update_cb = pci236_intr_update_cb,
        .intr_chk_clr_cb = pci236_intr_chk_clr_cb,
-       .bustype = pci_bustype,
 };
 
 static int pci236_auto_attach(struct comedi_device *dev,