summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-03-05 10:27:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-11 10:05:23 -0700
commit42169e2d8a536c4d6a24298078e0b06add77f502 (patch)
tree1537cb926ee8dd9b9f5b6414049acc804d6badb9
parentb9beb6c7e76a2ab4153b4c6eb675fe3c481300cf (diff)
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>
-rw-r--r--drivers/staging/comedi/drivers/das08.h1
-rw-r--r--drivers/staging/comedi/drivers/das08_cs.c1
-rw-r--r--drivers/staging/comedi/drivers/das08_pci.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h
index b102ad4918c4..89bb8d6fdfc6 100644
--- 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 cfeebe4d1ddd..d9f3e92317d3 100644
--- 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 ecab0c4f70f2..a56cee7f86dd 100644
--- 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,