Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
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>,
        Amir Mahdi Ghorbanian <indigoomega021@gmail.com>,
        devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] staging: vt6656: Remove duplicate code in vnt_vt3184_init function
Date:   Sat, 11 Apr 2020 14:51:03 +0200
Message-Id: <20200411125104.9625-2-oscar.carter@gmx.com>
In-Reply-To: <20200411125104.9625-1-oscar.carter@gmx.com>
References: <20200411125104.9625-1-oscar.carter@gmx.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Remove duplicate code in "if" statements because different branches are
almost the same.

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

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/ba=
seband.c
index a19a563d8bcc..276210a7284e 100644
=2D-- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -366,23 +366,15 @@ int vnt_vt3184_init(struct vnt_private *priv)

 	dev_dbg(&priv->usb->dev, "RF Type %d\n", priv->rf_type);

-	if (priv->rf_type =3D=3D RF_AL2230 ||
-	    priv->rf_type =3D=3D RF_AL2230S) {
+	if ((priv->rf_type =3D=3D RF_AL2230) ||
+	    (priv->rf_type =3D=3D RF_AL2230S) ||
+	    (priv->rf_type =3D=3D RF_AIROHA7230)) {
 		priv->bb_rx_conf =3D vnt_vt3184_al2230[10];
 		length =3D sizeof(vnt_vt3184_al2230);
 		addr =3D vnt_vt3184_al2230;

-		priv->bb_vga[0] =3D 0x1C;
-		priv->bb_vga[1] =3D 0x10;
-		priv->bb_vga[2] =3D 0x0;
-		priv->bb_vga[3] =3D 0x0;
-
-	} else if (priv->rf_type =3D=3D RF_AIROHA7230) {
-		priv->bb_rx_conf =3D vnt_vt3184_al2230[10];
-		length =3D sizeof(vnt_vt3184_al2230);
-		addr =3D vnt_vt3184_al2230;
-
-		addr[0xd7] =3D 0x06;
+		if (priv->rf_type =3D=3D RF_AIROHA7230)
+			addr[0xd7] =3D 0x06;

 		priv->bb_vga[0] =3D 0x1c;
 		priv->bb_vga[1] =3D 0x10;
@@ -390,22 +382,8 @@ int vnt_vt3184_init(struct vnt_private *priv)
 		priv->bb_vga[3] =3D 0x0;

 	} else if ((priv->rf_type =3D=3D RF_VT3226) ||
-			(priv->rf_type =3D=3D RF_VT3226D0)) {
-		priv->bb_rx_conf =3D vnt_vt3184_vt3226d0[10];
-		length =3D sizeof(vnt_vt3184_vt3226d0);
-		addr =3D vnt_vt3184_vt3226d0;
-
-		priv->bb_vga[0] =3D 0x20;
-		priv->bb_vga[1] =3D 0x10;
-		priv->bb_vga[2] =3D 0x0;
-		priv->bb_vga[3] =3D 0x0;
-
-		/* Fix VT3226 DFC system timing issue */
-		ret =3D vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2,
-					  SOFTPWRCTL_RFLEOPT);
-		if (ret)
-			goto end;
-	} else if (priv->rf_type =3D=3D RF_VT3342A0) {
+		   (priv->rf_type =3D=3D RF_VT3226D0) ||
+		   (priv->rf_type =3D=3D RF_VT3342A0)) {
 		priv->bb_rx_conf =3D vnt_vt3184_vt3226d0[10];
 		length =3D sizeof(vnt_vt3184_vt3226d0);
 		addr =3D vnt_vt3184_vt3226d0;
@@ -435,19 +413,13 @@ int vnt_vt3184_init(struct vnt_private *priv)
 	if (ret)
 		goto end;

-	if (priv->rf_type =3D=3D RF_VT3226 ||
-	    priv->rf_type =3D=3D RF_VT3342A0) {
-		ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,
-					 MAC_REG_ITRTMSET, 0x23);
-		if (ret)
-			goto end;
+	if ((priv->rf_type =3D=3D RF_VT3226) ||
+	    (priv->rf_type =3D=3D RF_VT3342A0) ||
+	    (priv->rf_type =3D=3D RF_VT3226D0)) {
+		data =3D (priv->rf_type =3D=3D RF_VT3226D0) ? 0x11 : 0x23;

-		ret =3D vnt_mac_reg_bits_on(priv, MAC_REG_PAPEDELAY, BIT(0));
-		if (ret)
-			goto end;
-	} else if (priv->rf_type =3D=3D RF_VT3226D0) {
 		ret =3D vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,
-					 MAC_REG_ITRTMSET, 0x11);
+					 MAC_REG_ITRTMSET, data);
 		if (ret)
 			goto end;

=2D-
2.20.1