Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 17:28:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: ni_daq_700: remove the subdev_700_init function

Browse Source 
Move the contents of subdev_700_init into the attach function.
For aesthetic reasone, add some whitespace to the initialization
of the subdevice.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-22 16:30:13 -07:00 committed by Greg Kroah-Hartman
parent 797a9e782a
commit be7085ae31
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/comedi/drivers/ni_daq_700.c
View File

@ -102,26 +102,6 @@ static int subdev_700_insn_config(struct comedi_device *dev,
return 1;
}
static int subdev_700_init(struct comedi_device *dev,
struct comedi_subdevice *s,
int (*cb) (int, int, int, unsigned long),
unsigned long arg)
{
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 16;
s->range_table = &range_digital;
s->maxdata = 1;
s->insn_bits = subdev_700_insn;
s->insn_config = subdev_700_insn_config;
s->state = 0;
s->io_bits = 0x00ff;
return 0;
}
static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct dio700_board *thisboard = comedi_board(dev);
@ -171,7 +151,16 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* DAQCard-700 dio */
s = dev->subdevices + 0;
subdev_700_init(dev, s, NULL, dev->iobase);
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 16;
s->range_table = &range_digital;
s->maxdata = 1;
s->insn_bits = subdev_700_insn;
s->insn_config = subdev_700_insn_config;
s->state = 0;
s->io_bits = 0x00ff;
return 0;
};