forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: 8255: refactor subdev_8255_init

Browse source 
Refactor the initialization of the 8255 so that the private data
allocation is done before the subdevice is setup. This makes sure
that the setup is complete.

Also, add a bit of whitespace to improve the readability.

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-13 15:42:12 -07:00 • committed by Greg Kroah-Hartman
commit cc31b1be67
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/comedi/drivers/8255.c
View file

@ -310,27 +310,26 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,
{
struct subdev_8255_private *spriv;
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 24;
s->range_table = &range_digital;
s->maxdata = 1;
spriv = kmalloc(sizeof(*spriv), GFP_KERNEL);
if (!spriv)
return -ENOMEM;
s->private = spriv;
spriv->iobase = iobase;
if (io == NULL)
spriv->io = subdev_8255_io;
else
spriv->io = io;
s->insn_bits = subdev_8255_insn;
s->insn_config = subdev_8255_insn_config;
spriv->iobase = iobase;
spriv->io = io ? io : subdev_8255_io;
s->private = spriv;
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 24;
s->range_table = &range_digital;
s->maxdata = 1;
s->insn_bits = subdev_8255_insn;
s->insn_config = subdev_8255_insn_config;
s->state = 0;
s->io_bits = 0;
s->state = 0;
s->io_bits = 0;
do_config(dev, s);
return 0;