Received-SPF: pass (google.com: best guess record for 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>,
        Quentin Deslandes <quentin.deslandes@itdev.co.uk>,
        Malcolm Priestley <tvboxspy@gmail.com>,
        Dan Carpenter <dan.carpenter@oracle.com>,
        Amir Mahdi Ghorbanian <indigoomega021@gmail.com>,
        "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 4/5] staging: vt6656: Refactor the assignment of the phy->signal variable
Date:   Tue, 14 Apr 2020 17:38:48 +0200
Message-Id: <20200414153849.5785-5-oscar.carter@gmx.com>
In-Reply-To: <20200414153849.5785-1-oscar.carter@gmx.com>
References: <20200414153849.5785-1-oscar.carter@gmx.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Create a constant array with the values of the "phy->signal" for every
rate. Remove all "phy->signal" assignments inside the switch statement
and replace these with a single reading from the new vnt_phy_signal
array.

The constant array can be of one dimension because the OR mask with
BIT(3) or BIT(4) allow obtain a second value according to the rate,
the preamble_type and the pkt_type.

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

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/ba=
seband.c
index 149c9bba7108..3b6f2bcf91a7 100644
=2D-- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -196,6 +196,21 @@ static const struct vnt_threshold vt3342_vnt_threshol=
d[] =3D {
 	{41, 0xff, 0x00}
 };

+static const u8 vnt_phy_signal[] =3D {
+	0x00,	/* RATE_1M  */
+	0x01,	/* RATE_2M  */
+	0x02,	/* RATE_5M  */
+	0x03,	/* RATE_11M */
+	0x8b,	/* RATE_6M  */
+	0x8f,	/* RATE_9M  */
+	0x8a,	/* RATE_12M */
+	0x8e,	/* RATE_18M */
+	0x89,	/* RATE_24M */
+	0x8d,	/* RATE_36M */
+	0x88,	/* RATE_48M */
+	0x8c	/* RATE_54M */
+};
+
 /*
  * Description: Calculate data frame transmitting time
  *
@@ -264,6 +279,8 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 f=
rame_length,
 	u32 count =3D 0;
 	u32 tmp;
 	int ext_bit;
+	int i;
+	u8 mask =3D 0;
 	u8 preamble_type =3D priv->preamble_type;

 	bit_count =3D frame_length * 8;
@@ -272,27 +289,12 @@ void vnt_get_phy_field(struct vnt_private *priv, u32=
 frame_length,
 	switch (tx_rate) {
 	case RATE_1M:
 		count =3D bit_count;
-
-		phy->signal =3D 0x00;
-
 		break;
 	case RATE_2M:
 		count =3D bit_count / 2;
-
-		if (preamble_type =3D=3D PREAMBLE_SHORT)
-			phy->signal =3D 0x09;
-		else
-			phy->signal =3D 0x01;
-
 		break;
 	case RATE_5M:
 		count =3D DIV_ROUND_UP(bit_count * 10, 55);
-
-		if (preamble_type =3D=3D PREAMBLE_SHORT)
-			phy->signal =3D 0x0a;
-		else
-			phy->signal =3D 0x02;
-
 		break;
 	case RATE_11M:
 		count =3D bit_count / 11;
@@ -305,75 +307,20 @@ void vnt_get_phy_field(struct vnt_private *priv, u32=
 frame_length,
 				ext_bit =3D true;
 		}

-		if (preamble_type =3D=3D PREAMBLE_SHORT)
-			phy->signal =3D 0x0b;
-		else
-			phy->signal =3D 0x03;
-
-		break;
-	case RATE_6M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x9b;
-		else
-			phy->signal =3D 0x8b;
-
-		break;
-	case RATE_9M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x9f;
-		else
-			phy->signal =3D 0x8f;
-
-		break;
-	case RATE_12M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x9a;
-		else
-			phy->signal =3D 0x8a;
-
 		break;
-	case RATE_18M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x9e;
-		else
-			phy->signal =3D 0x8e;
-
-		break;
-	case RATE_24M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x99;
-		else
-			phy->signal =3D 0x89;
-
-		break;
-	case RATE_36M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x9d;
-		else
-			phy->signal =3D 0x8d;
-
-		break;
-	case RATE_48M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x98;
-		else
-			phy->signal =3D 0x88;
+	}

-		break;
-	case RATE_54M:
-		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x9c;
-		else
-			phy->signal =3D 0x8c;
-		break;
-	default:
+	if (tx_rate > RATE_11M) {
 		if (pkt_type =3D=3D PK_TYPE_11A)
-			phy->signal =3D 0x9c;
-		else
-			phy->signal =3D 0x8c;
-		break;
+			mask =3D BIT(4);
+	} else if (tx_rate > RATE_1M) {
+		if (preamble_type =3D=3D PREAMBLE_SHORT)
+			mask =3D BIT(3);
 	}

+	i =3D tx_rate > RATE_54M ? RATE_54M : tx_rate;
+	phy->signal =3D vnt_phy_signal[i] | mask;
+
 	if (pkt_type =3D=3D PK_TYPE_11B) {
 		phy->service =3D 0x00;
 		if (ext_bit)
=2D-
2.20.1