Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / staging / vt6655 / card.c

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index eba4ee0750dc61bcaed74abbbb7a791c5245b0b6..e65c9825ea5af5c76aed4c887c25dcb2f3a1ca97 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -79,14 +79,10 @@ static void s_vCalculateOFDMRParameter(unsigned char byRate, u8 bb_type,
  *
  * Return Value: none
  */
-static
-void
-s_vCalculateOFDMRParameter(
-       unsigned char byRate,
-       u8 bb_type,
-       unsigned char *pbyTxRate,
-       unsigned char *pbyRsvTime
-)
+static void s_vCalculateOFDMRParameter(unsigned char byRate,
+                                      u8 bb_type,
+                                      unsigned char *pbyTxRate,
+                                      unsigned char *pbyRsvTime)
 {
        switch (byRate) {
        case RATE_6M:
@@ -736,8 +732,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
        VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_24,
                     MAKEWORD(byTxRate, byRsvTime));
        /* RSPINF_a_36 */
-       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate(
-                                                          (void *)priv,
+       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv,
                                                           RATE_36M),
                                   bb_type,
                                   &byTxRate,
@@ -745,8 +740,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
        VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_36,
                     MAKEWORD(byTxRate, byRsvTime));
        /* RSPINF_a_48 */
-       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate(
-                                                          (void *)priv,
+       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv,
                                                           RATE_48M),
                                   bb_type,
                                   &byTxRate,
@@ -754,8 +748,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
        VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_48,
                     MAKEWORD(byTxRate, byRsvTime));
        /* RSPINF_a_54 */
-       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate(
-                                                          (void *)priv,
+       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv,
                                                           RATE_54M),
                                   bb_type,
                                   &byTxRate,
@@ -763,8 +756,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
        VNSvOutPortW(priv->PortOffset + MAC_REG_RSPINF_A_54,
                     MAKEWORD(byTxRate, byRsvTime));
        /* RSPINF_a_72 */
-       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate(
-                                                          (void *)priv,
+       s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv,
                                                           RATE_54M),
                                   bb_type,
                                   &byTxRate,