staging: comedi: daqboard2000: use comedi_load_firmware()

Use comedi_load_firmware() instead of duplicating the code in a
private function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 6e6a9bb6b60210118853bbb4c29ae010ced5d578..ed3b3e665fa70a6463b8952b0f63b96d624d14af 100644 (file)
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -105,7 +105,6 @@ Configuration options: not applicable, uses PCI auto config
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/firmware.h>
 
 #include "../comedidev.h"
 
@@ -560,22 +559,6 @@ static int initialize_daqboard2000(struct comedi_device *dev,
        return result;
 }
 
-static int daqboard2000_upload_firmware(struct comedi_device *dev)
-{
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-       const struct firmware *fw;
-       int ret;
-
-       ret = request_firmware(&fw, DAQBOARD2000_FIRMWARE, &pcidev->dev);
-       if (ret)
-               return ret;
-
-       ret = initialize_daqboard2000(dev, fw->data, fw->size);
-       release_firmware(fw);
-
-       return ret;
-}
-
 static void daqboard2000_adcStopDmaTransfer(struct comedi_device *dev)
 {
 }
@@ -719,7 +702,9 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
 
        readl(devpriv->plx + 0x6c);
 
-       result = daqboard2000_upload_firmware(dev);
+       result = comedi_load_firmware(dev, &comedi_to_pci_dev(dev)->dev,
+                                     DAQBOARD2000_FIRMWARE,
+                                     initialize_daqboard2000);
        if (result < 0)
                return result;