Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: ni_6527: tidy up ni6527_auto_attach() 



For aesthetics, allocate the private data memory before attempting
to enable the PCI device.

Add some whitespace to the subdevice init.

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 21799633

drivers/staging/comedi/drivers/ni_6527.c

+20 −18
Original line number Diff line number Diff line
@@ -363,14 +363,14 @@ static int ni6527_auto_attach(struct comedi_device *dev, 
	dev->board_ptr = board;

	dev->board_name = board->name;



	ret = comedi_pci_enable(dev);

	if (ret)

		return ret;



	devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));

	if (!devpriv)

		return -ENOMEM;



	ret = comedi_pci_enable(dev);

	if (ret)

		return ret;



	devpriv->mmio_base = pci_ioremap_bar(pcidev, 1);

	if (!devpriv->mmio_base)

		return -ENOMEM;
@@ -390,21 +390,23 @@ static int ni6527_auto_attach(struct comedi_device *dev, 
	if (ret)

		return ret;



	/* Digital Input subdevice */

	s = &dev->subdevices[0];

	s->type		= COMEDI_SUBD_DI;

	s->subdev_flags	= SDF_READABLE;

	s->n_chan	= 24;

	s->range_table = &range_digital;

	s->maxdata	= 1;

	s->range_table	= &range_digital;

	s->insn_config	= ni6527_di_insn_config;

	s->insn_bits	= ni6527_di_insn_bits;



	/* Digital Output subdevice */

	s = &dev->subdevices[1];

	s->type		= COMEDI_SUBD_DO;

	s->subdev_flags = SDF_READABLE | SDF_WRITABLE;

	s->subdev_flags	= SDF_WRITABLE;

	s->n_chan	= 24;

	s->range_table = &range_unknown;  /* FIXME: actually conductance */

	s->maxdata	= 1;

	s->range_table	= &range_digital;

	s->insn_bits	= ni6527_do_insn_bits;



	/* Edge detection interrupt subdevice */