lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: me_daq: remove incomplete analog input command support

Browse Source 
The analog input subdevice functions me_ai_do_cmd_test() and me_ai_do_cmd()
are only stubbed in. They both just return 0.

The me_ai_cancel() function does have code to stop any running conversions
but the me_ai_insn_read() function does that also.

Just remove the incomplete functions and remove SDF_CMD_READ from the
subdevice_flags.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-10-25 15:10:03 -07:00
committed by Greg Kroah-Hartman
parent 14d09f79d7
commit aa0ed8280a
1 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/staging/comedi/drivers/me_daq.c
View File

@@ -373,42 +373,6 @@ static int me_ai_insn_read(struct comedi_device *dev,
return 1; return 1;
} }
/*
* ------------------------------------------------------------------
*
* HARDWARE TRIGGERED ANALOG INPUT SECTION
*
* ------------------------------------------------------------------
*/
/* Cancel analog input autoscan */
static int me_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{
struct me_private_data *dev_private = dev->private;
/* disable interrupts */
/* stop any running conversion */
dev_private->control_1 &= 0xFFFC;
writew(dev_private->control_1, dev_private->me_regbase + ME_CONTROL_1);
return 0;
}
/* Test analog input command */
static int me_ai_do_cmd_test(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
return 0;
}
/* Analog input command */
static int me_ai_do_cmd(struct comedi_device *dev,
struct comedi_subdevice *s)
{
return 0;
}
static int me_ao_insn_write(struct comedi_device *dev, static int me_ao_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, struct comedi_insn *insn,
@@ -690,15 +654,12 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
s = &dev->subdevices[0]; s = &dev->subdevices[0];
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_CMD_READ; s->subdev_flags = SDF_READABLE | SDF_COMMON;
s->n_chan = board->ai_chans; s->n_chan = board->ai_chans;
s->maxdata = (1 << board->ai_bits) - 1; s->maxdata = (1 << board->ai_bits) - 1;
s->len_chanlist = board->ai_chans; s->len_chanlist = board->ai_chans;
s->range_table = board->ai_range; s->range_table = board->ai_range;
s->cancel = me_ai_cancel;
s->insn_read = me_ai_insn_read; s->insn_read = me_ai_insn_read;
s->do_cmdtest = me_ai_do_cmd_test;
s->do_cmd = me_ai_do_cmd;
s = &dev->subdevices[1]; s = &dev->subdevices[1];
if (board->ao_chans) { if (board->ao_chans) {