Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337727
b: refs/heads/master
c: b964507
h: refs/heads/master
i:
  337725: 5dd1729
  337723: da158aa
  337719: bea786c
  337711: 3a78d47
  337695: 032b026
  337663: 574af93
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent b1b951f commit 5836674
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 35 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: 66511843c55b1124a8527b041cdde4bd1ae75422
refs/heads/master: b96450712fe3c67b1a4660425c581691ac888612
31 changes: 0 additions & 31 deletions trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@ static const struct comedi_lrange range_apci3120_ao = {
};


static unsigned int ui_Temp;

/* FUNCTION DEFINITIONS */

/*
Expand Down Expand Up @@ -2201,35 +2199,6 @@ static int apci3120_di_insn_bits(struct comedi_device *dev,
return insn->n;
}

/*
* Configure the output memory ON or OFF
*/
static int i_APCI3120_InsnConfigDigitalOutput(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]) {
devpriv->b_OutputMemoryStatus = APCI3120_ENABLE;

} else {
devpriv->b_OutputMemoryStatus = APCI3120_DISABLE;
devpriv->b_DigitalOutputRegister = 0;
}
if (!devpriv->b_OutputMemoryStatus)
ui_Temp = 0;
/* if(!devpriv->b_OutputMemoryStatus ) */

return insn->n;
}

static int apci3120_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,6 @@ static int apci3120_attach_pci(struct comedi_device *dev,
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 = i_APCI3120_InsnConfigDigitalOutput;
s->insn_bits = apci3120_do_insn_bits;

/* Allocate and Initialise Timer Subdevice Structures */
Expand Down

0 comments on commit 5836674

Please sign in to comment.