evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: usbduxfast: use comedi_load_firmware()

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2013-05-20 14:28:29 -07:00 • committed by Greg Kroah-Hartman
parent 87d87adcd7
commit f9eb8a3b14
1 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/staging/comedi/drivers/usbduxfast.c
View file

@ -36,7 +36,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/firmware.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -978,23 +977,24 @@ static int usbduxfast_attach_common(struct comedi_device *dev)
} }
static int usbduxfast_upload_firmware(struct comedi_device *dev, static int usbduxfast_upload_firmware(struct comedi_device *dev,
const struct firmware *fw) const u8 *data, size_t size,
unsigned long context)
{ {
struct usb_device *usb = comedi_to_usb_dev(dev); struct usb_device *usb = comedi_to_usb_dev(dev);
uint8_t *buf; uint8_t *buf;
unsigned char *tmp; unsigned char *tmp;
int ret; int ret;
if (!fw->data) if (!data)
return 0; return 0;
if (fw->size > FIRMWARE_MAX_LEN) { if (size > FIRMWARE_MAX_LEN) {
dev_err(dev->class_dev, "firmware binary too large for FX2\n"); dev_err(dev->class_dev, "firmware binary too large for FX2\n");
return -ENOMEM; return -ENOMEM;
} }
/* we generate a local buffer for the firmware */ /* we generate a local buffer for the firmware */
buf = kmemdup(fw->data, fw->size, GFP_KERNEL); buf = kmemdup(data, size, GFP_KERNEL);
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
@ -1023,7 +1023,7 @@ static int usbduxfast_upload_firmware(struct comedi_device *dev,
USBDUXFASTSUB_FIRMWARE, USBDUXFASTSUB_FIRMWARE,
VENDOR_DIR_OUT, VENDOR_DIR_OUT,
0, 0x0000, 0, 0x0000,
buf, fw->size, buf, size,
EZTIMEOUT); EZTIMEOUT);
if (ret < 0) { if (ret < 0) {
dev_err(dev->class_dev, "firmware upload failed\n"); dev_err(dev->class_dev, "firmware upload failed\n");
@ -1047,22 +1047,6 @@ done:
return ret; return ret;
} }
static int usbduxfast_request_firmware(struct comedi_device *dev)
{
struct usb_device *usb = comedi_to_usb_dev(dev);
const struct firmware *fw;
int ret;
ret = request_firmware(&fw, FIRMWARE, &usb->dev);
if (ret)
return ret;
ret = usbduxfast_upload_firmware(dev, fw);
release_firmware(fw);
return ret;
}
static int usbduxfast_auto_attach(struct comedi_device *dev, static int usbduxfast_auto_attach(struct comedi_device *dev,
unsigned long context_unused) unsigned long context_unused)
{ {
@ -1107,16 +1091,10 @@ static int usbduxfast_auto_attach(struct comedi_device *dev,
if (!devpriv->inbuf) if (!devpriv->inbuf)
return -ENOMEM; return -ENOMEM;
/* ret = comedi_load_firmware(dev, &usb->dev, FIRMWARE,
* Request, and upload, the firmware so we can usbduxfast_upload_firmware, 0);
* complete the comedi_driver (*auto_attach). if (ret)
*/
ret = usbduxfast_request_firmware(dev);
if (ret) {
dev_err(dev->class_dev, "could not load firmware (err=%d)\n",
ret);
return ret; return ret;
}
return usbduxfast_attach_common(dev); return usbduxfast_attach_common(dev);
} }