Commit da47d98f authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: FIRMWAREbDownload remove camel case

camel case changes
pDevice -> priv
NdisStatus -> status
pBuffer -> buffer
wLength -> length
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb73fd04
...@@ -43,14 +43,14 @@ static int msglevel = MSG_LEVEL_INFO; ...@@ -43,14 +43,14 @@ static int msglevel = MSG_LEVEL_INFO;
#define FIRMWARE_CHUNK_SIZE 0x400 #define FIRMWARE_CHUNK_SIZE 0x400
int FIRMWAREbDownload(struct vnt_private *pDevice) int FIRMWAREbDownload(struct vnt_private *priv)
{ {
struct device *dev = &pDevice->usb->dev; struct device *dev = &priv->usb->dev;
const struct firmware *fw; const struct firmware *fw;
int NdisStatus; int status;
void *pBuffer = NULL; void *buffer = NULL;
bool result = false; bool result = false;
u16 wLength; u16 length;
int ii, rc; int ii, rc;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n");
...@@ -62,24 +62,24 @@ int FIRMWAREbDownload(struct vnt_private *pDevice) ...@@ -62,24 +62,24 @@ int FIRMWAREbDownload(struct vnt_private *pDevice)
goto out; goto out;
} }
pBuffer = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL); buffer = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL);
if (!pBuffer) if (!buffer)
goto out; goto out;
for (ii = 0; ii < fw->size; ii += FIRMWARE_CHUNK_SIZE) { for (ii = 0; ii < fw->size; ii += FIRMWARE_CHUNK_SIZE) {
wLength = min_t(int, fw->size - ii, FIRMWARE_CHUNK_SIZE); length = min_t(int, fw->size - ii, FIRMWARE_CHUNK_SIZE);
memcpy(pBuffer, fw->data + ii, wLength); memcpy(buffer, fw->data + ii, length);
NdisStatus = vnt_control_out(pDevice, status = vnt_control_out(priv,
0, 0,
0x1200+ii, 0x1200+ii,
0x0000, 0x0000,
wLength, length,
pBuffer); buffer);
DBG_PRT(MSG_LEVEL_DEBUG, DBG_PRT(MSG_LEVEL_DEBUG,
KERN_INFO"Download firmware...%d %zu\n", ii, fw->size); KERN_INFO"Download firmware...%d %zu\n", ii, fw->size);
if (NdisStatus != STATUS_SUCCESS) if (status != STATUS_SUCCESS)
goto free_fw; goto free_fw;
} }
...@@ -88,7 +88,7 @@ int FIRMWAREbDownload(struct vnt_private *pDevice) ...@@ -88,7 +88,7 @@ int FIRMWAREbDownload(struct vnt_private *pDevice)
release_firmware(fw); release_firmware(fw);
out: out:
kfree(pBuffer); kfree(buffer);
return result; return result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment