staging: vt6656: rename FIRMWAREbBrach2Sram to vnt_firmware_branch_to_sram
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 4 Jun 2014 17:25:32 +0000 (18:25 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2014 22:59:49 +0000 (15:59 -0700)
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/firmware.c
drivers/staging/vt6656/firmware.h
drivers/staging/vt6656/main_usb.c

index 3990698a305c2dbb9dd972868b1ec62447cb319a..78e9283c3ca1810d7ccbf0d7556a62de27960f8f 100644 (file)
@@ -91,7 +91,7 @@ out:
 }
 MODULE_FIRMWARE(FIRMWARE_NAME);
 
-int FIRMWAREbBrach2Sram(struct vnt_private *priv)
+int vnt_firmware_branch_to_sram(struct vnt_private *priv)
 {
        int status;
 
@@ -137,7 +137,7 @@ int FIRMWAREbCheckVersion(struct vnt_private *priv)
 
        if (priv->wFirmwareVersion < FIRMWARE_VERSION) {
                /* branch to loader for download new firmware */
-               FIRMWAREbBrach2Sram(priv);
+               vnt_firmware_branch_to_sram(priv);
                return false;
        }
        return true;
index 961afb7486ada17bd3029364fd9349c2b2a93f79..eb25932659dbb03d881aa6a69221618c70d873c8 100644 (file)
@@ -33,7 +33,7 @@
 #include "device.h"
 
 int vnt_download_firmware(struct vnt_private *);
-int FIRMWAREbBrach2Sram(struct vnt_private *);
+int vnt_firmware_branch_to_sram(struct vnt_private *);
 int FIRMWAREbCheckVersion(struct vnt_private *);
 
 #endif /* __FIRMWARE_H__ */
index 0c9eb604a7212427d56578d95e2e055f310a4b93..c5adc346e97b81f4208e12cce8b92affc677f513 100644 (file)
@@ -289,9 +289,9 @@ static int device_init_registers(struct vnt_private *pDevice)
 
        if (!FIRMWAREbCheckVersion(pDevice)) {
                if (vnt_download_firmware(pDevice) == true) {
-                       if (FIRMWAREbBrach2Sram(pDevice) == false) {
+                       if (vnt_firmware_branch_to_sram(pDevice) == false) {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-                                       " FIRMWAREbBrach2Sram fail\n");
+                                       " vnt_firmware_branch_to_sram fail\n");
                                return false;
                        }
                } else {