From: Malcolm Priestley Date: Sun, 20 Jul 2014 14:33:21 +0000 (+0100) Subject: staging: vt6656: struct vnt_private replace bShortSlotTime with short_slot_time X-Git-Tag: v3.17-rc1~123^2~415 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a641c9ec886a1fd2cb3419959c8014f14983d379;p=karo-tx-linux.git staging: vt6656: struct vnt_private replace bShortSlotTime with short_slot_time Removing type prefix and camel case Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index ab5ce02a34d7..8b2b2e7d2cd4 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -526,7 +526,7 @@ void vnt_set_short_slot_time(struct vnt_private *priv) { u8 bb_vga = 0; - if (priv->bShortSlotTime) + if (priv->short_slot_time) priv->bb_rx_conf &= 0xdf; else priv->bb_rx_conf |= 0x20; @@ -545,7 +545,7 @@ void vnt_set_vga_gain_offset(struct vnt_private *priv, u8 data) vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0xE7, data); /* patch for 3253B0 Baseband with Cardbus module */ - if (priv->bShortSlotTime) + if (priv->short_slot_time) priv->bb_rx_conf &= 0xdf; /* 1101 1111 */ else priv->bb_rx_conf |= 0x20; /* 0010 0000 */ diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 8e00377c26ec..75b586b10276 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -381,7 +381,7 @@ void vnt_update_ifs(struct vnt_private *priv) priv->sifs = C_SIFS_BG; - if (priv->bShortSlotTime) + if (priv->short_slot_time) priv->slot = C_SLOT_SHORT; else priv->slot = C_SLOT_LONG; diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index fd230b3c8c78..35bc8c62d213 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -358,7 +358,7 @@ struct vnt_private { enum nl80211_iftype op_mode; - int bShortSlotTime; + int short_slot_time; int bBarkerPreambleMd; /* Power save */ diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index e8ce52dbaa8d..f7f4dccfafc7 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -342,9 +342,9 @@ static int device_init_registers(struct vnt_private *priv) * set Short Slot Time, xIFS, and RSPINF */ if (priv->bb_type == BB_TYPE_11A) - priv->bShortSlotTime = true; + priv->short_slot_time = true; else - priv->bShortSlotTime = false; + priv->short_slot_time = false; vnt_set_short_slot_time(priv); @@ -768,9 +768,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_ERP_SLOT) { if (conf->use_short_slot) - priv->bShortSlotTime = true; + priv->short_slot_time = true; else - priv->bShortSlotTime = false; + priv->short_slot_time = false; vnt_set_short_slot_time(priv); vnt_set_vga_gain_offset(priv, priv->abyBBVGA[0]);