staging: comedi: amplc_pc236: absorb pc236_pci_common_attach()

Absorb `pc236_pci_common_attach()` into `pc236_auto_attach()` since
that's the only place it is called from.

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>

diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index f99c7f1ab94319059d3dfa62851020784ff06375..22d3b6f08e40d131212371320098e0f960c213af 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -351,22 +351,6 @@ static int pc236_common_attach(struct comedi_device *dev, unsigned long iobase,
        return 0;
 }
 
-static int pc236_pci_common_attach(struct comedi_device *dev,
-                                  struct pci_dev *pci_dev)
-{
-       struct pc236_private *devpriv = dev->private;
-       unsigned long iobase;
-       int ret;
-
-       ret = comedi_pci_enable(dev);
-       if (ret)
-               return ret;
-
-       devpriv->lcr_iobase = pci_resource_start(pci_dev, 1);
-       iobase = pci_resource_start(pci_dev, 2);
-       return pc236_common_attach(dev, iobase, pci_dev->irq, IRQF_SHARED);
-}
-
 static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        const struct pc236_board *thisboard = comedi_board(dev);
@@ -400,6 +384,8 @@ static int pc236_auto_attach(struct comedi_device *dev,
 {
        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
        struct pc236_private *devpriv;
+       unsigned long iobase;
+       int ret;
 
        if (!DO_PCI)
                return -EINVAL;
@@ -415,7 +401,13 @@ static int pc236_auto_attach(struct comedi_device *dev,
                dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
                return -EINVAL;
        }
-       return pc236_pci_common_attach(dev, pci_dev);
+       ret = comedi_pci_enable(dev);
+       if (ret)
+               return ret;
+
+       devpriv->lcr_iobase = pci_resource_start(pci_dev, 1);
+       iobase = pci_resource_start(pci_dev, 2);
+       return pc236_common_attach(dev, iobase, pci_dev->irq, IRQF_SHARED);
 }
 
 static void pc236_detach(struct comedi_device *dev)