[PATCH 7/7] staging: comedi: amplc_pc236, amplc_pci236: get rid of bustype

From: Ian Abbott
Date: Mon Jul 28 2014 - 08:11:19 EST


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@xxxxxxxxx>
---
drivers/staging/comedi/drivers/amplc_pc236.c | 1 -
drivers/staging/comedi/drivers/amplc_pc236.h | 3 ---
drivers/staging/comedi/drivers/amplc_pci236.c | 1 -
3 files changed, 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index b95b877..875cc19 100644
--- 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 37348f1..91d6d9c 100644
--- 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 a7e7a6f..436aeba 100644
--- 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,
--
2.0.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/