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

staging: comedi: amplc_pci230: absorb pci230_attach_common()

Browse Source 
`pci230_attach_common()` is now only called from `pci230_auto_attach()`,
so absorb it into that function.

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:40 +01:00 committed by Greg Kroah-Hartman
parent 5668ddf083
commit c800752bc8
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2557,15 +2557,31 @@ static int pci230_alloc_private(struct comedi_device *dev)
return 0;
}
/* Common part of attach and auto_attach. */
static int pci230_attach_common(struct comedi_device *dev,
struct pci_dev *pci_dev)
static int pci230_auto_attach(struct comedi_device *dev,
unsigned long context_unused)
{
const struct pci230_board *thisboard = comedi_board(dev);
struct pci230_private *devpriv = dev->private;
struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
const struct pci230_board *thisboard;
struct pci230_private *devpriv;
struct comedi_subdevice *s;
int rc;
dev_info(dev->class_dev, "amplc_pci230: attach pci %s\n",
pci_name(pci_dev));
rc = pci230_alloc_private(dev);
if (rc)
return rc;
dev->board_ptr = pci230_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
dev_err(dev->class_dev,
"amplc_pci230: BUG! cannot determine board type!\n");
return -EINVAL;
}
thisboard = comedi_board(dev);
devpriv = dev->private;
comedi_set_hw_dev(dev, &pci_dev->dev);
dev->board_name = thisboard->name;
@ -2710,28 +2726,6 @@ static int pci230_attach_common(struct comedi_device *dev,
return 0;
}
static int pci230_auto_attach(struct comedi_device *dev,
unsigned long context_unused)
{
struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
int rc;
dev_info(dev->class_dev, "amplc_pci230: attach pci %s\n",
pci_name(pci_dev));
rc = pci230_alloc_private(dev);
if (rc)
return rc;
dev->board_ptr = pci230_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
dev_err(dev->class_dev,
"amplc_pci230: BUG! cannot determine board type!\n");
return -EINVAL;
}
return pci230_attach_common(dev, pci_dev);
}
static struct comedi_driver amplc_pci230_driver = {
.driver_name = "amplc_pci230",
.module = THIS_MODULE,