diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-05-17 18:17:22 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-17 19:09:49 (GMT) |
| commit | 41278f3390048f723e9117b277958dfa354d7c89 (patch) | |
| tree | 0d7474f9048126047d0c9ac5c671c1adeadf273a /drivers/staging | |
| parent | 9ff8b151881adb408d1337bd7654cc869e9f42e0 (diff) | |
| download | linux-fsl-qoriq-41278f3390048f723e9117b277958dfa354d7c89.tar.xz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/daqboard2000.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index 6e6a9bb..ed3b3e6 100644 --- 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; |