Commit cc31b1be authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: 8255: refactor subdev_8255_init 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d29a18dc

drivers/staging/comedi/drivers/8255.c

+15 −16
Original line number Diff line number Diff line
@@ -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;

	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;



	do_config(dev, s);



	return 0;