iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: amplc_pci230: absorb pci230_alloc_private()

Browse Source 
`pci230_alloc_private()` is now only called from `pci230_auto_attach()`
to allocate private device storage and initialize various spin-lock
members therein.  Absorb the body of `pci230_alloc_private()` into
`pci230_auto_attach()` itself.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2014-09-01 12:03:42 +01:00 committed by Greg Kroah-Hartman
parent 77ffced7af
commit 0a89e71472
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/comedi/drivers/amplc_pci230.c
View File

@ -2542,21 +2542,6 @@ static const struct pci230_board *pci230_find_pci_board(struct pci_dev *pci_dev)
return NULL; return NULL;
} }
static int pci230_alloc_private(struct comedi_device *dev)
{
struct pci230_private *devpriv;
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
spin_lock_init(&devpriv->isr_spinlock);
spin_lock_init(&devpriv->res_spinlock);
spin_lock_init(&devpriv->ai_stop_spinlock);
spin_lock_init(&devpriv->ao_stop_spinlock);
return 0;
}
static int pci230_auto_attach(struct comedi_device *dev, static int pci230_auto_attach(struct comedi_device *dev,
unsigned long context_unused) unsigned long context_unused)
{ {
@ -2569,9 +2554,14 @@ static int pci230_auto_attach(struct comedi_device *dev,
dev_info(dev->class_dev, "amplc_pci230: attach pci %s\n", dev_info(dev->class_dev, "amplc_pci230: attach pci %s\n",
pci_name(pci_dev)); pci_name(pci_dev));
rc = pci230_alloc_private(dev); devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (rc) if (!devpriv)
return rc; return -ENOMEM;
spin_lock_init(&devpriv->isr_spinlock);
spin_lock_init(&devpriv->res_spinlock);
spin_lock_init(&devpriv->ai_stop_spinlock);
spin_lock_init(&devpriv->ao_stop_spinlock);
dev->board_ptr = pci230_find_pci_board(pci_dev); dev->board_ptr = pci230_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) { if (dev->board_ptr == NULL) {
@ -2580,8 +2570,6 @@ static int pci230_auto_attach(struct comedi_device *dev,
return -EINVAL; return -EINVAL;
} }
thisboard = comedi_board(dev); thisboard = comedi_board(dev);
devpriv = dev->private;
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
rc = comedi_pci_enable(dev); rc = comedi_pci_enable(dev);