staging: comedi: das08: remove 'id' from boardinfo

With the bus specific code split out, the device id in the boardinfo
is no longer needed. Remove it.

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

diff --git a/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h
index b102ad4..89bb8d6 100644 (file)
--- a/drivers/staging/comedi/drivers/das08.h
+++ b/drivers/staging/comedi/drivers/das08.h
@@ -32,7 +32,6 @@ enum das08_lrange { das08_pg_none, das08_bipolar5, das08_pgh, das08_pgl,
 
 struct das08_board_struct {
        const char *name;
-       unsigned int id;        /*  id for pci/pcmcia boards */
        bool is_jr;             /* true for 'JR' boards */
        unsigned int ai_nbits;
        enum das08_lrange ai_pg;

diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index cfeebe4..d9f3e92 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -59,7 +59,6 @@ Command support does not exist, but could be added for this board.
 static const struct das08_board_struct das08_cs_boards[] = {
        {
                .name           = "pcm-das08",
-               .id             = 0x0,  /*  XXX */
                .ai_nbits       = 12,
                .ai_pg          = das08_bipolar5,
                .ai_encoding    = das08_pcm_encode12,

diff --git a/drivers/staging/comedi/drivers/das08_pci.c b/drivers/staging/comedi/drivers/das08_pci.c
index ecab0c4..a56cee7 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_pci.c
+++ b/drivers/staging/comedi/drivers/das08_pci.c
@@ -46,7 +46,6 @@
 static const struct das08_board_struct das08_pci_boards[] = {
        {
                .name           = "pci-das08",
-               .id             = PCI_DEVICE_ID_PCIDAS08,
                .ai_nbits       = 12,
                .ai_pg          = das08_bipolar5,
                .ai_encoding    = das08_encode12,