From: Tommaso Merciai Date: Sun, 10 Oct 2021 21:59:45 +0000 (+0200) Subject: staging: vt6655: fix camelcase in byLocalID X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e9c1caea96599a3d7e1918e1c342f905436759cb;p=linux.git staging: vt6655: fix camelcase in byLocalID Replace camel case variable name for variable byLocalID with snake case equivalent. Signed-off-by: Tommaso Merciai Link: https://lore.kernel.org/r/20211010220014.148785-1-tomm.merciai@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index d6e114f256850..0bae35af6e0fe 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1994,7 +1994,7 @@ bool bb_vt3253_init(struct vnt_private *priv) int ii; void __iomem *iobase = priv->port_offset; unsigned char by_rf_type = priv->byRFType; - unsigned char by_local_id = priv->byLocalID; + unsigned char by_local_id = priv->local_id; if (by_rf_type == RF_RFMD2959) { if (by_local_id <= REV_ID_VT3253_A1) { diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index b5e6880555fd3..834b9db05dff9 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -427,7 +427,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv) MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_RXON); - bb_set_deep_sleep(priv, priv->byLocalID); + bb_set_deep_sleep(priv, priv->local_id); priv->bRadioOff = true; pr_debug("chester power off\n"); diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 76ee3146b8658..b550a1a0844e5 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -193,7 +193,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) bb_software_reset(priv); - if (priv->byLocalID > REV_ID_VT3253_B1) { + if (priv->local_id > REV_ID_VT3253_B1) { unsigned long flags; spin_lock_irqsave(&priv->lock, flags); diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index ea6f9568f112b..92d6f82f939f3 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -154,7 +154,7 @@ struct vnt_private { u32 rx_bytes; /* Version control */ - unsigned char byLocalID; + unsigned char local_id; unsigned char byRFType; unsigned char byMaxPwrLevel; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 3683a9d65017c..24f0e346da129 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -219,7 +219,7 @@ static void device_init_registers(struct vnt_private *priv) MACvInitialize(priv); /* Get Local ID */ - VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->byLocalID); + VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->local_id); spin_lock_irqsave(&priv->lock, flags); @@ -331,7 +331,7 @@ static void device_init_registers(struct vnt_private *priv) (unsigned char)(ii + EEP_OFS_OFDMA_PWR_dBm)); } - if (priv->byLocalID > REV_ID_VT3253_B1) { + if (priv->local_id > REV_ID_VT3253_B1) { MACvSelectPage1(priv->port_offset); VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1, @@ -398,7 +398,7 @@ static void device_init_registers(struct vnt_private *priv) /* reset Rx pointer */ CARDvSafeResetTx(priv); - if (priv->byLocalID <= REV_ID_VT3253_A1) + if (priv->local_id <= REV_ID_VT3253_A1) MACvRegBitsOn(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); /* Turn On Rx DMA */ diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index 2d06cecc03075..a7d1d35de5d46 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -100,7 +100,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb, rx_status.rate_idx = rate_idx; if (ieee80211_has_protected(fc)) { - if (priv->byLocalID > REV_ID_VT3253_A1) + if (priv->local_id > REV_ID_VT3253_A1) rx_status.flag |= RX_FLAG_DECRYPTED; /* Drop packet */ diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c index 20881cf2f394a..f843966a3ea46 100644 --- a/drivers/staging/vt6655/key.c +++ b/drivers/staging/vt6655/key.c @@ -81,7 +81,7 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr, } MACvSetKeyEntry(priv, key_mode, entry, key_inx, - bssid, (u32 *)key->key, priv->byLocalID); + bssid, (u32 *)key->key, priv->local_id); return 0; } diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 1ae7148b40927..80cced7dfda81 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -763,14 +763,14 @@ bool MACbPSWakeup(struct vnt_private *priv) void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, unsigned int uEntryIdx, unsigned int uKeyIdx, unsigned char *pbyAddr, u32 *pdwKey, - unsigned char byLocalID) + unsigned char local_id) { void __iomem *io_base = priv->port_offset; unsigned short offset; u32 data; int ii; - if (byLocalID <= 1) + if (local_id <= 1) return; offset = MISCFIFO_KEYETRY0; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3043d2813074b..550dc4da80a95 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -921,7 +921,7 @@ bool MACbPSWakeup(struct vnt_private *priv); void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, unsigned int uEntryIdx, unsigned int uKeyIdx, unsigned char *pbyAddr, u32 *pdwKey, - unsigned char byLocalID); + unsigned char local_id); void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx); #endif /* __MAC_H__ */ diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 7ec7fd3093292..ff0b5391ea0b0 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1012,7 +1012,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, cbFrameSize += info->control.hw_key->icv_len; - if (pDevice->byLocalID > REV_ID_VT3253_A1) { + if (pDevice->local_id > REV_ID_VT3253_A1) { /* MAC Header should be padding 0 to DW alignment. */ uPadding = 4 - (ieee80211_get_hdrlen_from_skb(skb) % 4); uPadding %= 4;