From 9a4d2c12508e49bce86f42b416f8b9a675f0375c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 1 Nov 2012 17:26:31 -0700 Subject: [PATCH] --- yaml --- r: 337603 b: refs/heads/master c: 43deb75dcc9073bc3d51347da16df74569a6d7ba h: refs/heads/master i: 337601: 32076b55373e196561b71b91f36ba1018d0bccb6 337599: 3c43b8e66c7d378c08f5144a7f15cd821b7d9b0a v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_3120.c | 30 ++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 56ef7b9a010c..875129526019 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53b168b938101fc16bc8a980950458aa41a83aa8 +refs/heads/master: 43deb75dcc9073bc3d51347da16df74569a6d7ba diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c index 83f4ce8cc2df..5f82f10ba585 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -259,24 +259,20 @@ static int apci3120_attach_pci(struct comedi_device *dev, } /* Allocate and Initialise DO Subdevice Structures */ s = &dev->subdevices[3]; - if (this_board->i_NbrDoChannel) { - s->type = COMEDI_SUBD_DO; - s->subdev_flags = - SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = this_board->i_NbrDoChannel; - s->maxdata = this_board->i_DoMaxdata; - s->len_chanlist = this_board->i_NbrDoChannel; - s->range_table = &range_digital; - s->io_bits = 0xf; /* all bits output */ + s->type = COMEDI_SUBD_DO; + s->subdev_flags = + SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; + s->n_chan = this_board->i_NbrDoChannel; + s->maxdata = this_board->i_DoMaxdata; + s->len_chanlist = this_board->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; - } + /* 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; /* Allocate and Initialise Timer Subdevice Structures */ s = &dev->subdevices[4];