AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-27 05:50:04 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: usbdux: remove the SUBDEV_* defines

Browse Source 
These defines are only used to index the dev->subdevices array
during the attach. It's cleaner to just open-code the values.

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 2013-07-24 14:11:33 -07:00 committed by Greg Kroah-Hartman
parent c9f3363a30
commit e5acdc3561
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/comedi/drivers/usbdux.c
View File

@ -182,21 +182,6 @@ sampling rate. If you sample two channels you get 4kHz and so on.
/* must have more buffers due to buggy USB ctr */ /* must have more buffers due to buggy USB ctr */
#define NUMOFOUTBUFFERSHIGH 10 #define NUMOFOUTBUFFERSHIGH 10
/* Analogue in subdevice */
#define SUBDEV_AD 0
/* Analogue out subdevice */
#define SUBDEV_DA 1
/* Digital I/O */
#define SUBDEV_DIO 2
/* counter */
#define SUBDEV_COUNTER 3
/* timer aka pwm output */
#define SUBDEV_PWM 4
/* number of retries to get the right dux command */ /* number of retries to get the right dux command */
#define RETRIES 10 #define RETRIES 10
@ -2113,7 +2098,7 @@ static int usbdux_auto_attach(struct comedi_device *dev,
return ret; return ret;
/* Analog Input subdevice */ /* Analog Input subdevice */
s = &dev->subdevices[SUBDEV_AD]; s = &dev->subdevices[0];
dev->read_subdev = s; dev->read_subdev = s;
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_CMD_READ; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_CMD_READ;
@ -2127,7 +2112,7 @@ static int usbdux_auto_attach(struct comedi_device *dev,
s->cancel = usbdux_ai_cancel; s->cancel = usbdux_ai_cancel;
/* Analog Output subdevice */ /* Analog Output subdevice */
s = &dev->subdevices[SUBDEV_DA]; s = &dev->subdevices[1];
dev->write_subdev = s; dev->write_subdev = s;
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_CMD_WRITE; s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_CMD_WRITE;
@ -2142,7 +2127,7 @@ static int usbdux_auto_attach(struct comedi_device *dev,
s->insn_write = usbdux_ao_insn_write; s->insn_write = usbdux_ao_insn_write;
/* Digital I/O subdevice */ /* Digital I/O subdevice */
s = &dev->subdevices[SUBDEV_DIO]; s = &dev->subdevices[2];
s->type = COMEDI_SUBD_DIO; s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 8; s->n_chan = 8;
@ -2152,7 +2137,7 @@ static int usbdux_auto_attach(struct comedi_device *dev,
s->insn_config = usbdux_dio_insn_config; s->insn_config = usbdux_dio_insn_config;
/* Counter subdevice */ /* Counter subdevice */
s = &dev->subdevices[SUBDEV_COUNTER]; s = &dev->subdevices[3];
s->type = COMEDI_SUBD_COUNTER; s->type = COMEDI_SUBD_COUNTER;
s->subdev_flags = SDF_WRITABLE | SDF_READABLE; s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
s->n_chan = 4; s->n_chan = 4;
@ -2163,7 +2148,7 @@ static int usbdux_auto_attach(struct comedi_device *dev,
if (devpriv->high_speed) { if (devpriv->high_speed) {
/* PWM subdevice */ /* PWM subdevice */
s = &dev->subdevices[SUBDEV_PWM]; s = &dev->subdevices[4];
s->type = COMEDI_SUBD_PWM; s->type = COMEDI_SUBD_PWM;
s->subdev_flags = SDF_WRITABLE | SDF_PWM_HBRIDGE; s->subdev_flags = SDF_WRITABLE | SDF_PWM_HBRIDGE;
s->n_chan = 8; s->n_chan = 8;