From: Dominik Karol PiÄ…tkowski Date: Wed, 18 Sep 2024 19:20:51 +0000 (+0000) Subject: staging: vt6655: s_uGetDataDuration: Rename pDevice parameter X-Git-Tag: v6.13-rc1~30^2~178 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad43c5c60cf8b0b847e039fb4aeef86396f87882;p=thirdparty%2Flinux.git staging: vt6655: s_uGetDataDuration: Rename pDevice parameter This patch renames pDevice to priv in s_uGetDataDuration function in order to avoid using camel case. Signed-off-by: Dominik Karol PiÄ…tkowski Link: https://lore.kernel.org/r/20240918191959.51539-2-dominik.karol.piatkowski@protonmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 1ea17e86e3ee2..a2e34be6f8c1e 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -238,7 +238,7 @@ static __le16 get_rtscts_time(struct vnt_private *priv, static unsigned int s_uGetDataDuration( - struct vnt_private *pDevice, + struct vnt_private *priv, unsigned char byDurType, unsigned int cbFrameLength, unsigned char byPktType, @@ -264,9 +264,9 @@ s_uGetDataDuration( switch (byDurType) { case DATADUR_B: /* DATADUR_B */ if (bNeedAck) { - uAckTime = bb_get_frame_time(pDevice->preamble_type, + uAckTime = bb_get_frame_time(priv->preamble_type, byPktType, 14, - pDevice->byTopCCKBasicRate); + priv->byTopCCKBasicRate); } /* Non Frag or Last Frag */ if ((uMACfragNum == 1) || bLastFrag) { @@ -274,17 +274,17 @@ s_uGetDataDuration( return 0; } else { /* First Frag or Mid Frag */ - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, + uNextPktTime = s_uGetTxRsvTime(priv, byPktType, len, wRate, bNeedAck); } - return pDevice->uSIFS + uAckTime + uNextPktTime; + return priv->uSIFS + uAckTime + uNextPktTime; case DATADUR_A: /* DATADUR_A */ if (bNeedAck) { - uAckTime = bb_get_frame_time(pDevice->preamble_type, + uAckTime = bb_get_frame_time(priv->preamble_type, byPktType, 14, - pDevice->byTopOFDMBasicRate); + priv->byTopOFDMBasicRate); } /* Non Frag or Last Frag */ if ((uMACfragNum == 1) || bLastFrag) { @@ -292,18 +292,18 @@ s_uGetDataDuration( return 0; } else { /* First Frag or Mid Frag */ - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, + uNextPktTime = s_uGetTxRsvTime(priv, byPktType, len, wRate, bNeedAck); } - return pDevice->uSIFS + uAckTime + uNextPktTime; + return priv->uSIFS + uAckTime + uNextPktTime; case DATADUR_A_F0: /* DATADUR_A_F0 */ case DATADUR_A_F1: /* DATADUR_A_F1 */ if (bNeedAck) { - uAckTime = bb_get_frame_time(pDevice->preamble_type, + uAckTime = bb_get_frame_time(priv->preamble_type, byPktType, 14, - pDevice->byTopOFDMBasicRate); + priv->byTopOFDMBasicRate); } /* Non Frag or Last Frag */ if ((uMACfragNum == 1) || bLastFrag) { @@ -323,11 +323,11 @@ s_uGetDataDuration( else wRate = fb_opt1[FB_RATE0][wRate]; - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, + uNextPktTime = s_uGetTxRsvTime(priv, byPktType, len, wRate, bNeedAck); } - return pDevice->uSIFS + uAckTime + uNextPktTime; + return priv->uSIFS + uAckTime + uNextPktTime; default: break;