Commit 32d5767a authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_at_ao: tidy up atao_attach()

For aesthetics, add some whitespace to the subdevice init.

Remove the printk noise at the end of the attach.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf9fab83
...@@ -340,11 +340,8 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -340,11 +340,8 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct atao_board *board = comedi_board(dev); const struct atao_board *board = comedi_board(dev);
struct atao_private *devpriv; struct atao_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int ao_unipolar;
int ret; int ret;
ao_unipolar = it->options[3];
ret = comedi_request_region(dev, it->options[0], 0x20); ret = comedi_request_region(dev, it->options[0], 0x20);
if (ret) if (ret)
return ret; return ret;
...@@ -357,28 +354,25 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -357,28 +354,25 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret) if (ret)
return ret; return ret;
/* Analog Output subdevice */
s = &dev->subdevices[0]; s = &dev->subdevices[0];
/* analog output subdevice */ s->type = COMEDI_SUBD_AO;
s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE;
s->subdev_flags = SDF_WRITABLE; s->n_chan = board->n_ao_chans;
s->n_chan = board->n_ao_chans; s->maxdata = 0x0fff;
s->maxdata = (1 << 12) - 1; s->range_table = it->options[3] ? &range_unipolar10 : &range_bipolar10;
if (ao_unipolar) s->insn_write = atao_ao_insn_write;
s->range_table = &range_unipolar10; s->insn_read = atao_ao_insn_read;
else
s->range_table = &range_bipolar10; /* Digital I/O subdevice */
s->insn_write = atao_ao_insn_write;
s->insn_read = atao_ao_insn_read;
s = &dev->subdevices[1]; s = &dev->subdevices[1];
/* digital i/o subdevice */ 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; s->maxdata = 1;
s->maxdata = 1; s->range_table = &range_digital;
s->range_table = &range_digital; s->insn_bits = atao_dio_insn_bits;
s->insn_bits = atao_dio_insn_bits; s->insn_config = atao_dio_insn_config;
s->insn_config = atao_dio_insn_config;
/* caldac subdevice */ /* caldac subdevice */
s = &dev->subdevices[2]; s = &dev->subdevices[2];
...@@ -389,15 +383,12 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -389,15 +383,12 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_read = atao_calib_insn_read; s->insn_read = atao_calib_insn_read;
s->insn_write = atao_calib_insn_write; s->insn_write = atao_calib_insn_write;
/* EEPROM subdevice */
s = &dev->subdevices[3]; s = &dev->subdevices[3];
/* eeprom subdevice */ s->type = COMEDI_SUBD_UNUSED;
/* s->type=COMEDI_SUBD_EEPROM; */
s->type = COMEDI_SUBD_UNUSED;
atao_reset(dev); atao_reset(dev);
printk(KERN_INFO "\n");
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment