From 8a73f9da4803721fd96d99d686430ee303486d49 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 19 Jul 2014 12:30:05 +0100 Subject: [PATCH] staging: vt6656: struct vnt_private rename wFirmwareVersion to firmware_version Removing camel case Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/device.h | 2 +- drivers/staging/vt6656/firmware.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 416a55d06355..b9f48416d4d1 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 f2250ee81ffa..eae4f32d9b66 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; -- 2.34.1