This patch renames pDevice to priv in s_uGetDataDuration function in order to avoid using camel case. Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@xxxxxxxxxxxxxx> --- drivers/staging/vt6655/rxtx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 3705cb1e87b6..a1dadc3e8cb5 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -229,7 +229,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, @@ -255,9 +255,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) { @@ -265,17 +265,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) { @@ -283,18 +283,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) { @@ -314,11 +314,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; -- 2.34.1