[PATCH 09/20] staging: comedi: s626: factor out the dma buffer allocation

[H Hartley Sweeten]

To make the attach a bit cleaner, factor the dma buffer allocation
out of attach_pci() into a new function.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/s626.c | 57 ++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c 
b/drivers/staging/comedi/drivers/s626.c
index a9d78c7..61bb8ab 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2437,6 +2437,33 @@ static void CountersInit(struct comedi_device *dev)
        }
 }
 
+static int s626_allocate_dma_buffers(struct comedi_device *dev)
+{
+       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+       void *addr;
+       dma_addr_t appdma;
+
+       devpriv->allocatedBuf = 0;
+
+       addr = pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
+       if (!addr)
+               return -ENOMEM;
+       devpriv->ANABuf.LogicalBase = addr;
+       devpriv->ANABuf.PhysicalBase = appdma;
+
+       devpriv->allocatedBuf++;
+
+       addr = pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
+       if (!addr)
+               return -ENOMEM;
+       devpriv->RPSBuf.LogicalBase = addr;
+       devpriv->RPSBuf.PhysicalBase = appdma;
+
+       devpriv->allocatedBuf++;
+
+       return 0;
+}
+
 static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 {
 /*   uint8_t   PollList; */
@@ -2446,7 +2473,6 @@ static int s626_attach_pci(struct comedi_device *dev, 
struct pci_dev *pcidev)
 /*   unsigned int data[16]; */
        int i;
        int ret;
-       dma_addr_t appdma;
        struct comedi_subdevice *s;
 
        comedi_set_hw_dev(dev, &pcidev->dev);
@@ -2473,32 +2499,9 @@ static int s626_attach_pci(struct comedi_device *dev, 
struct pci_dev *pcidev)
 
        /* DMA FIXME DMA// */
 
-       /* adc buffer allocation */
-       devpriv->allocatedBuf = 0;
-
-       devpriv->ANABuf.LogicalBase =
-               pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
-
-       if (devpriv->ANABuf.LogicalBase == NULL) {
-               printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
-               return -ENOMEM;
-       }
-
-       devpriv->ANABuf.PhysicalBase = appdma;
-
-       devpriv->allocatedBuf++;
-
-       devpriv->RPSBuf.LogicalBase =
-               pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
-
-       if (devpriv->RPSBuf.LogicalBase == NULL) {
-               printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
-               return -ENOMEM;
-       }
-
-       devpriv->RPSBuf.PhysicalBase = appdma;
-
-       devpriv->allocatedBuf++;
+       ret = s626_allocate_dma_buffers(dev);
+       if (ret)
+               return ret;
 
        ret = comedi_alloc_subdevices(dev, 6);
        if (ret)
-- 
1.7.11

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel