From 583667475d3927e5cf9a5747fdab24fed25d668c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 6 Nov 2012 10:06:07 -0700 Subject: [PATCH] --- yaml --- r: 337727 b: refs/heads/master c: b96450712fe3c67b1a4660425c581691ac888612 h: refs/heads/master i: 337725: 5dd1729b37a96dae38b2f6f6ad9e9c177dbe4d78 337723: da158aa08b62236ec48a4408696c4c8433fbe78e 337719: bea786cc431d7a4d6e9c533534a99234a7f5faf9 337711: 3a78d47d7a6e9323191b578352fc9ede6ee745e5 337695: 032b026e3a7dc7df29331a032096cb883ea5ce9e 337663: 574af93a3f22698b0cbb74411c6ae0009a6b2d6d v: v3 --- [refs] | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 31 ------------------- .../staging/comedi/drivers/addi_apci_3120.c | 3 -- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/[refs] b/[refs] index 061fae67a0d5..bf677a4edb9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66511843c55b1124a8527b041cdde4bd1ae75422 +refs/heads/master: b96450712fe3c67b1a4660425c581691ac888612 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 106b286724f9..0bc4eda1f742 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -242,8 +242,6 @@ static const struct comedi_lrange range_apci3120_ao = { }; -static unsigned int ui_Temp; - /* FUNCTION DEFINITIONS */ /* @@ -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, diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c index 1326a2ec42b5..f65f8271807d 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -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 */