summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten2014-09-04 19:39:39 +0200
committerGreg Kroah-Hartman2014-09-08 22:54:06 +0200
commit1e9879f7a443d9bd06dd40544c1b91766008b880 (patch)
tree181e950c5ec705d2e06734bba92466076786b6c5
parentstaging: comedi: adl_pci9118: allocate private data in pci9118_common_attach() (diff)
downloadkernel-qcow2-linux-1e9879f7a443d9bd06dd40544c1b91766008b880.tar.gz
kernel-qcow2-linux-1e9879f7a443d9bd06dd40544c1b91766008b880.tar.xz
kernel-qcow2-linux-1e9879f7a443d9bd06dd40544c1b91766008b880.zip
staging: comedi: adl_pci9118: tidy up digital output subdevice init
For aesthetics, add some whitespace to the digital output subdevice init. Remove the SDF_GROUND and SDF_COMMON subdev_flags. These flags only apply to analog subdevices. Remove the 'len_chanlist' init, this subdevice member is only used with subdevices that support async commands. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/adl_pci9118.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 8b086c22b2e9..d7af6f74d363 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -1907,14 +1907,14 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
s->range_table = &range_digital;
s->insn_bits = pci9118_insn_bits_di;
+ /* Digital Output subdevice */
s = &dev->subdevices[3];
- s->type = COMEDI_SUBD_DO;
- s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
- s->n_chan = 4;
- s->maxdata = 1;
- s->len_chanlist = 4;
- s->range_table = &range_digital;
- s->insn_bits = pci9118_insn_bits_do;
+ s->type = COMEDI_SUBD_DO;
+ s->subdev_flags = SDF_WRITABLE;
+ s->n_chan = 4;
+ s->maxdata = 1;
+ s->range_table = &range_digital;
+ s->insn_bits = pci9118_insn_bits_do;
devpriv->ai_maskharderr = 0x10a;
/* default measure crash condition */