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

staging: comedi: usbdux: use comedi_load_firmware()

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

Also, rename firmware_upload() to have namespace associated with
the driver.

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:30:41 -07:00 • committed by Greg Kroah-Hartman
parent 997beda3da
commit 1383b9ddb8
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/staging/comedi/drivers/usbdux.c
View file

@ -89,7 +89,6 @@ sampling rate. If you sample two channels you get 4kHz and so on.
#include <linux/usb.h>
#include <linux/fcntl.h>
#include <linux/compiler.h>
#include <linux/firmware.h>
#include "../comedidev.h"
@ -724,9 +723,11 @@ static void usbduxsub_ao_isoc_irq(struct urb *urb)
#define FIRMWARE_MAX_LEN 0x2000
static int firmware_upload(struct usbduxsub *usbduxsub,
const u8 *data, int size)
static int usbdux_firmware_upload(struct comedi_device *dev,
const u8 *data, size_t size,
unsigned long context)
{
struct usbduxsub *usbduxsub = dev->private;
struct usb_device *usb = usbduxsub->usbdev;
uint8_t *buf;
uint8_t *tmp;
@ -2251,16 +2252,15 @@ static int usbdux_auto_attach(struct comedi_device *dev,
struct usb_interface *uinterf = comedi_to_usb_interface(dev);
struct usbduxsub *this_usbduxsub = usb_get_intfdata(uinterf);
struct usb_device *usb = usbduxsub->usbdev;
const struct firmware *fw;
int ret;
ret = request_firmware(&fw, FIRMWARE, &usb->dev);
if (ret == 0) {
ret = firmware_upload(this_usbduxsub, fw->data, fw->size);
release_firmware(fw);
}
if (ret < 0)
dev->private = this_usbduxsub; /* This is temporary... */
ret = comedi_load_firmware(dev, &usb->dev, FIRMWARE,
usbdux_firmware_upload, 0);
if (ret < 0) {
dev->private = NULL;
return ret;
}
dev->private = NULL;