Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Oscar Carter <oscar.carter@gmx.com>
To:     Forest Bond <forest@alittletooquiet.net>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Oscar Carter <oscar.carter@gmx.com>,
        Malcolm Priestley <tvboxspy@gmail.com>,
        Quentin Deslandes <quentin.deslandes@itdev.co.uk>,
        "John B. Wyatt IV" <jbwyatt4@gmail.com>,
        Colin Ian King <colin.king@canonical.com>,
        devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] staging: vt6656: Refactor the vnt_set_bss_mode function
Date:   Wed, 29 Apr 2020 17:23:07 +0200
Message-Id: <20200429152307.5871-3-oscar.carter@gmx.com>
In-Reply-To: <20200429152307.5871-1-oscar.carter@gmx.com>
References: <20200429152307.5871-1-oscar.carter@gmx.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Remove all the duplicate code in the "if, else if, else" statements as
all the branches in every "if" are almost the same. The only difference
between branches is some value. So, use variables instead of repeat
code.

Also, remove the unnecessary casting to u8 type because the
"priv->bb_type" variable is already an u8 tpe.

Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
=2D--
 drivers/staging/vt6656/card.c | 68 ++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 0854b70cb89f..3cb97c4daeb8 100644
=2D-- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -472,62 +472,56 @@ int vnt_radio_power_on(struct vnt_private *priv)
 int vnt_set_bss_mode(struct vnt_private *priv)
 {
 	int ret;
+	unsigned char type =3D priv->bb_type;
+	unsigned char data =3D 0;
+	unsigned char bb_vga_0 =3D 0x1c;
+	unsigned char bb_vga_2_3 =3D 0x00;

 	if (priv->rf_type =3D=3D RF_AIROHA7230 && priv->bb_type =3D=3D BB_TYPE_1=
1A)
-		ret =3D vnt_mac_set_bb_type(priv, BB_TYPE_11G);
-	else
-		ret =3D vnt_mac_set_bb_type(priv, priv->bb_type);
+		type =3D BB_TYPE_11G;

+	ret =3D vnt_mac_set_bb_type(priv, type);
 	if (ret)
 		return ret;

 	priv->packet_type =3D vnt_get_pkt_type(priv);

-	if (priv->bb_type =3D=3D BB_TYPE_11A)
-		ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,
-					 0x88, 0x03);
-	else if (priv->bb_type =3D=3D BB_TYPE_11B)
-		ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,
-					 0x88, 0x02);
-	else if (priv->bb_type =3D=3D BB_TYPE_11G)
+	if (priv->bb_type =3D=3D BB_TYPE_11A) {
+		data =3D 0x03;
+		bb_vga_0 =3D 0x20;
+		bb_vga_2_3 =3D 0x10;
+	} else if (priv->bb_type =3D=3D BB_TYPE_11B) {
+		data =3D 0x02;
+	} else if (priv->bb_type =3D=3D BB_TYPE_11G) {
+		data =3D 0x08;
+	}
+
+	if (data) {
 		ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,
-					 0x88, 0x08);
-	if (ret)
-		return ret;
+					 0x88, data);
+		if (ret)
+			return ret;
+	}

 	ret =3D vnt_update_ifs(priv);
 	if (ret)
 		return ret;

-	ret =3D vnt_set_rspinf(priv, (u8)priv->bb_type);
+	ret =3D vnt_set_rspinf(priv, priv->bb_type);
 	if (ret)
 		return ret;

-	if (priv->bb_type =3D=3D BB_TYPE_11A) {
-		if (priv->rf_type =3D=3D RF_AIROHA7230) {
-			priv->bb_vga[0] =3D 0x20;
+	if (priv->rf_type =3D=3D RF_AIROHA7230) {
+		priv->bb_vga[0] =3D bb_vga_0;

-			ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,
-						 0xe7, priv->bb_vga[0]);
-			if (ret)
-				return ret;
-		}
-
-		priv->bb_vga[2] =3D 0x10;
-		priv->bb_vga[3] =3D 0x10;
-	} else {
-		if (priv->rf_type =3D=3D RF_AIROHA7230) {
-			priv->bb_vga[0] =3D 0x1c;
-
-			ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,
-						 0xe7, priv->bb_vga[0]);
-			if (ret)
-				return ret;
-		}
-
-		priv->bb_vga[2] =3D 0x0;
-		priv->bb_vga[3] =3D 0x0;
+		ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,
+					 0xe7, priv->bb_vga[0]);
+		if (ret)
+			return ret;
 	}

+	priv->bb_vga[2] =3D bb_vga_2_3;
+	priv->bb_vga[3] =3D bb_vga_2_3;
+
 	return vnt_set_vga_gain_offset(priv, priv->bb_vga[0]);
 }
=2D-
2.20.1