V4L/DVB (3428): drivers/media/dvb/ possible cleanups

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb / dvb-usb / dvb-usb-firmware.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
index ab87af99d36fe9b676d498c0c4ab6b799e6b9f5e..9222b0a81f748646f82eda2ec382e16af1d2db7d 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
@@ -24,16 +24,19 @@ static struct usb_cypress_controller cypress[] = {
        { .id = CYPRESS_FX2,     .name = "Cypress FX2",     .cpu_cs_register = 0xe600 },
 };
 
+static int dvb_usb_get_hexline(const struct firmware *fw, struct hexline *hx,
+                              int *pos);
+
 /*
  * load a firmware packet to the device
  */
 static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len)
 {
        return usb_control_msg(udev, usb_sndctrlpipe(udev,0),
-                       0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5*HZ);
+                       0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000);
 }
 
-static int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
+int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
 {
        struct hexline hx;
        u8 reset;
@@ -73,6 +76,7 @@ static int usb_cypress_load_firmware(struct usb_device *udev, const struct firmw
 
        return ret;
 }
+EXPORT_SYMBOL(usb_cypress_load_firmware);
 
 int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_properties *props)
 {
@@ -111,7 +115,8 @@ int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_properties
        return ret;
 }
 
-int dvb_usb_get_hexline(const struct firmware *fw, struct hexline *hx, int *pos)
+static int dvb_usb_get_hexline(const struct firmware *fw, struct hexline *hx,
+                              int *pos)
 {
        u8 *b = (u8 *) &fw->data[*pos];
        int data_offs = 4;
@@ -141,5 +146,3 @@ int dvb_usb_get_hexline(const struct firmware *fw, struct hexline *hx, int *pos)
 
        return *pos;
 }
-EXPORT_SYMBOL(dvb_usb_get_hexline);
-