tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: ni_6527: tidy up ni6527_auto_attach()

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

Add some whitespace to the subdevice init.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2013-10-01 15:14:27 -07:00
committed by Greg Kroah-Hartman
parent 21799633d6
commit ea19a2a720
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/comedi/drivers/ni_6527.c
+19 -17
View File
@@ -363,14 +363,14 @@ static int ni6527_auto_attach(struct comedi_device *dev,
dev->board_ptr = board; dev->board_ptr = board;
dev->board_name = board->name; dev->board_name = board->name;
ret = comedi_pci_enable(dev);
if (ret)
return ret;
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv) if (!devpriv)
return -ENOMEM; return -ENOMEM;
ret = comedi_pci_enable(dev);
if (ret)
return ret;
devpriv->mmio_base = pci_ioremap_bar(pcidev, 1); devpriv->mmio_base = pci_ioremap_bar(pcidev, 1);
if (!devpriv->mmio_base) if (!devpriv->mmio_base)
return -ENOMEM; return -ENOMEM;
@@ -390,22 +390,24 @@ static int ni6527_auto_attach(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
/* Digital Input subdevice */
s = &dev->subdevices[0]; s = &dev->subdevices[0];
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
s->n_chan = 24; s->n_chan = 24;
s->range_table = &range_digital; s->maxdata = 1;
s->maxdata = 1; s->range_table = &range_digital;
s->insn_config = ni6527_di_insn_config; s->insn_config = ni6527_di_insn_config;
s->insn_bits = ni6527_di_insn_bits; s->insn_bits = ni6527_di_insn_bits;
/* Digital Output subdevice */
s = &dev->subdevices[1]; s = &dev->subdevices[1];
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->subdev_flags = SDF_WRITABLE;
s->n_chan = 24; s->n_chan = 24;
s->range_table = &range_unknown; /* FIXME: actually conductance */ s->maxdata = 1;
s->maxdata = 1; s->range_table = &range_digital;
s->insn_bits = ni6527_do_insn_bits; s->insn_bits = ni6527_do_insn_bits;
/* Edge detection interrupt subdevice */ /* Edge detection interrupt subdevice */
s = &dev->subdevices[2]; s = &dev->subdevices[2];