mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 03:42:52 +00:00
staging: comedi: adv_pci1724: absorb setup_subdevices()
For aesthetics, absorb this function into the (*auto_attach). 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:
parent
70adf763ba
commit
27de4358f9
@ -130,18 +130,28 @@ static int adv_pci1724_insn_write(struct comedi_device *dev,
|
||||
return insn->n;
|
||||
}
|
||||
|
||||
/* Allocate and initialize the subdevice structures.
|
||||
*/
|
||||
static int setup_subdevices(struct comedi_device *dev)
|
||||
static int adv_pci1724_auto_attach(struct comedi_device *dev,
|
||||
unsigned long context_unused)
|
||||
{
|
||||
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
|
||||
struct comedi_subdevice *s;
|
||||
unsigned int board_id;
|
||||
int ret;
|
||||
|
||||
ret = comedi_pci_enable(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
dev->iobase = pci_resource_start(pcidev, 2);
|
||||
board_id = inl(dev->iobase + PCI1724_BOARD_ID_REG);
|
||||
dev_info(dev->class_dev, "board id: %d\n",
|
||||
board_id & PCI1724_BOARD_ID_MASK);
|
||||
|
||||
ret = comedi_alloc_subdevices(dev, 3);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* analog output subdevice */
|
||||
/* Analog Output subdevice */
|
||||
s = &dev->subdevices[0];
|
||||
s->type = COMEDI_SUBD_AO;
|
||||
s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND;
|
||||
@ -155,7 +165,7 @@ static int setup_subdevices(struct comedi_device *dev)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* offset calibration */
|
||||
/* Offset Calibration subdevice */
|
||||
s = &dev->subdevices[1];
|
||||
s->type = COMEDI_SUBD_CALIB;
|
||||
s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;
|
||||
@ -168,7 +178,7 @@ static int setup_subdevices(struct comedi_device *dev)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* gain calibration */
|
||||
/* Gain Calibration subdevice */
|
||||
s = &dev->subdevices[2];
|
||||
s->type = COMEDI_SUBD_CALIB;
|
||||
s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;
|
||||
@ -181,29 +191,6 @@ static int setup_subdevices(struct comedi_device *dev)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adv_pci1724_auto_attach(struct comedi_device *dev,
|
||||
unsigned long context_unused)
|
||||
{
|
||||
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
|
||||
int retval;
|
||||
unsigned int board_id;
|
||||
|
||||
retval = comedi_pci_enable(dev);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
dev->iobase = pci_resource_start(pcidev, 2);
|
||||
board_id = inl(dev->iobase + PCI1724_BOARD_ID_REG);
|
||||
dev_info(dev->class_dev, "board id: %d\n",
|
||||
board_id & PCI1724_BOARD_ID_MASK);
|
||||
|
||||
retval = setup_subdevices(dev);
|
||||
if (retval < 0)
|
||||
return retval;
|
||||
|
||||
dev_info(dev->class_dev, "%s (pci %s) attached, board id: %u\n",
|
||||
dev->board_name, pci_name(pcidev), board_id);
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user