Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337724
b: refs/heads/master
c: e9840e6
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent da158aa commit c22e8aa
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e7be560b7d42413b94d46a5ada25fb0a8f732fc
refs/heads/master: e9840e632a2fd22b3af4a2593df49dcc94923e50
27 changes: 0 additions & 27 deletions trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,33 +621,6 @@ static int apci3200_di_insn_bits(struct comedi_device *dev,
return insn->n;
}

/*
* Configures The Digital Output Subdevice.
*
* data[0] = 1 Memory enable
* = 0 Memory Disable
*/
static int i_APCI3200_ConfigDigitalOutput(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;

if ((data[0] != 0) && (data[0] != 1)) {
comedi_error(dev,
"Not a valid Data !!! ,Data should be 1 or 0\n");
return -EINVAL;
} /* if ( (data[0]!=0) && (data[0]!=1) ) */
if (data[0]) {
devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
} /* if (data[0]) */
else {
devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
} /* else if (data[0]) */
return insn->n;
}

static int apci3200_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/comedi/drivers/addi_apci_3200.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ static const struct addi_board apci3200_boardtypes[] = {
.ai_cmd = i_APCI3200_CommandAnalogInput,
.ai_cancel = i_APCI3200_StopCyclicAcquisition,
.di_bits = apci3200_di_insn_bits,
.do_config = i_APCI3200_ConfigDigitalOutput,
.do_bits = apci3200_do_insn_bits,
}, {
.pc_DriverName = "apci3300",
Expand Down Expand Up @@ -80,7 +79,6 @@ static const struct addi_board apci3200_boardtypes[] = {
.ai_cmd = i_APCI3200_CommandAnalogInput,
.ai_cancel = i_APCI3200_StopCyclicAcquisition,
.di_bits = apci3200_di_insn_bits,
.do_config = i_APCI3200_ConfigDigitalOutput,
.do_bits = apci3200_do_insn_bits,
},
};
Expand Down

0 comments on commit c22e8aa

Please sign in to comment.