summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-07-19 12:30:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-21 12:11:56 -0700
commit8a73f9da4803721fd96d99d686430ee303486d49 (patch)
treeae5879d0df565b5bd2300b10f4bb2bc3d6b202a6 /drivers/staging/vt6656
parent03b7e3548c2a327c287e0fcb1908e4f7b013ab13 (diff)
downloadop-kernel-dev-8a73f9da4803721fd96d99d686430ee303486d49.zip
op-kernel-dev-8a73f9da4803721fd96d99d686430ee303486d49.tar.gz
staging: vt6656: struct vnt_private rename wFirmwareVersion to firmware_version
Removing camel case Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r--drivers/staging/vt6656/device.h2
-rw-r--r--drivers/staging/vt6656/firmware.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 416a55d..b9f4841 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -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;
diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c
index f2250ee..eae4f32d 100644
--- a/drivers/staging/vt6656/firmware.c
+++ b/drivers/staging/vt6656/firmware.c
@@ -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;
OpenPOWER on IntegriCloud