From 5500b39fd7412ebb07365455a7be7dee1f8f246b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 5 Nov 2012 14:35:30 -0700 Subject: [PATCH] --- yaml --- r: 337659 b: refs/heads/master c: 5dbdbf67c3574cec17640ad63109b3b2ef322617 h: refs/heads/master i: 337657: d74cb562421b3d1cd33397f4bd45a4ba039fb646 337655: 55542d17e2748a59fba20b454c92852938bf393f v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_1032.c | 21 ++----------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 039c84ef11c6..36581e5267f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df9133bf19c8fab1ac8932fe4a6e12de6f8f4ddf +refs/heads/master: 5dbdbf67c3574cec17640ad63109b3b2ef322617 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c index b34001a539a0..5ba28613b2c0 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c @@ -224,27 +224,10 @@ static int apci1032_attach_pci(struct comedi_device *dev, } else { s->type = COMEDI_SUBD_UNUSED; } + /* Allocate and Initialise DO Subdevice Structures */ s = &dev->subdevices[3]; - if (devpriv->s_EeParameters.i_NbrDoChannel) { - s->type = COMEDI_SUBD_DO; - s->subdev_flags = - SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel; - s->maxdata = devpriv->s_EeParameters.i_DoMaxdata; - s->len_chanlist = - devpriv->s_EeParameters.i_NbrDoChannel; - s->range_table = &range_digital; - s->io_bits = 0xf; /* all bits output */ - - /* insn_config - for digital output memory */ - s->insn_config = this_board->do_config; - s->insn_write = this_board->do_write; - s->insn_bits = this_board->do_bits; - s->insn_read = this_board->do_read; - } else { - s->type = COMEDI_SUBD_UNUSED; - } + s->type = COMEDI_SUBD_UNUSED; /* Allocate and Initialise Timer Subdevice Structures */ s = &dev->subdevices[4];