]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: vt6656: struct vnt_private rename wFirmwareVersion to firmware_version
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 19 Jul 2014 11:30:05 +0000 (12:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 19:11:56 +0000 (12:11 -0700)
Removing camel case

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/device.h
drivers/staging/vt6656/firmware.c

index 416a55d06355052931a593a3a06c335972f89a3c..b9f48416d4d1a680fe5084957c72c158bb7ec621 100644 (file)
@@ -299,7 +299,7 @@ struct vnt_private {
        struct vnt_interrupt_buffer int_buf;
 
        /* Version control */
-       u16 wFirmwareVersion;
+       u16 firmware_version;
        u8 byLocalID;
        u8 byRFType;
        u8 byBBRxConf;
index f2250ee81ffac1a94b852a94faf0808dc5208ea7..eae4f32d9b66aa88ba510da31f66f0a418e88cc3 100644 (file)
@@ -118,24 +118,24 @@ int vnt_check_firmware_version(struct vnt_private *priv)
                                        0,
                                        MESSAGE_REQUEST_VERSION,
                                        2,
-                                       (u8 *) &(priv->wFirmwareVersion));
+                                       (u8 *)&priv->firmware_version);
 
        dev_dbg(&priv->usb->dev, "Firmware Version [%04x]\n",
-                                               priv->wFirmwareVersion);
+                                               priv->firmware_version);
 
        if (status != STATUS_SUCCESS) {
                dev_dbg(&priv->usb->dev, "Firmware Invalid.\n");
                return false;
        }
-       if (priv->wFirmwareVersion == 0xFFFF) {
+       if (priv->firmware_version == 0xFFFF) {
                dev_dbg(&priv->usb->dev, "In Loader.\n");
                return false;
        }
 
        dev_dbg(&priv->usb->dev, "Firmware Version [%04x]\n",
-                                               priv->wFirmwareVersion);
+                                               priv->firmware_version);
 
-       if (priv->wFirmwareVersion < FIRMWARE_VERSION) {
+       if (priv->firmware_version < FIRMWARE_VERSION) {
                /* branch to loader for download new firmware */
                vnt_firmware_branch_to_sram(priv);
                return false;