diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2014-09-01 12:03:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-02 11:21:31 -0700 |
| commit | 0a89e7147229d183f9e5566fc774d8e0dfeff627 (patch) | |
| tree | 806eef89f9d609aceaadec5501df6a9084cfc009 /drivers/staging/comedi/drivers/amplc_pci230.c | |
| parent | 77ffced7af82c13243a642e731b52fc1714fd48a (diff) | |
staging: comedi: amplc_pci230: absorb pci230_alloc_private()
`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>
Diffstat (limited to 'drivers/staging/comedi/drivers/amplc_pci230.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci230.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index bd2e6483ac55..794e0ca4197e 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -2542,21 +2542,6 @@ static const struct pci230_board *pci230_find_pci_board(struct pci_dev *pci_dev) 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, 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", pci_name(pci_dev)); - rc = pci230_alloc_private(dev); - if (rc) - return rc; + 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); dev->board_ptr = pci230_find_pci_board(pci_dev); if (dev->board_ptr == NULL) { @@ -2580,8 +2570,6 @@ static int pci230_auto_attach(struct comedi_device *dev, return -EINVAL; } thisboard = comedi_board(dev); - devpriv = dev->private; - dev->board_name = thisboard->name; rc = comedi_pci_enable(dev); |