From: Malcolm Priestley Date: Wed, 4 Jun 2014 17:25:31 +0000 (+0100) Subject: staging: vt6656: rename FIRMWAREbDownload to vnt_download_firmware X-Git-Tag: v3.17-rc1~123^2~1735 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6a86b77820c41d460146589d01b83a5e62e4d0a7;p=~emulex%2Finfiniband.git staging: vt6656: rename FIRMWAREbDownload to vnt_download_firmware 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 83680bc5910..3990698a305 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -40,7 +40,7 @@ #define FIRMWARE_CHUNK_SIZE 0x400 -int FIRMWAREbDownload(struct vnt_private *priv) +int vnt_download_firmware(struct vnt_private *priv) { struct device *dev = &priv->usb->dev; const struct firmware *fw; diff --git a/drivers/staging/vt6656/firmware.h b/drivers/staging/vt6656/firmware.h index e3b08db6a73..961afb7486a 100644 --- a/drivers/staging/vt6656/firmware.h +++ b/drivers/staging/vt6656/firmware.h @@ -32,7 +32,7 @@ #include "device.h" -int FIRMWAREbDownload(struct vnt_private *); +int vnt_download_firmware(struct vnt_private *); int FIRMWAREbBrach2Sram(struct vnt_private *); int FIRMWAREbCheckVersion(struct vnt_private *); diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index ebb095553bf..0c9eb604a72 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -288,7 +288,7 @@ static int device_init_registers(struct vnt_private *pDevice) memcpy(pDevice->abySNAP_Bridgetunnel, abySNAP_Bridgetunnel, ETH_ALEN); if (!FIRMWAREbCheckVersion(pDevice)) { - if (FIRMWAREbDownload(pDevice) == true) { + if (vnt_download_firmware(pDevice) == true) { if (FIRMWAREbBrach2Sram(pDevice) == false) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " FIRMWAREbBrach2Sram fail\n");