From: Malcolm Priestley Date: Wed, 4 Jun 2014 17:25:32 +0000 (+0100) Subject: staging: vt6656: rename FIRMWAREbBrach2Sram to vnt_firmware_branch_to_sram X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=14321461256d04dd05fea70b96d352b9f7188495;p=openwrt%2Fstaging%2Fblogic.git staging: vt6656: rename FIRMWAREbBrach2Sram to vnt_firmware_branch_to_sram Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index 3990698a305c..78e9283c3ca1 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -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; diff --git a/drivers/staging/vt6656/firmware.h b/drivers/staging/vt6656/firmware.h index 961afb7486ad..eb25932659db 100644 --- a/drivers/staging/vt6656/firmware.h +++ b/drivers/staging/vt6656/firmware.h @@ -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__ */ diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 0c9eb604a721..c5adc346e97b 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -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 {