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>,
        Colin Ian King <colin.king@canonical.com>,
        Gabriela Bittencourt <gabrielabittencourt00@gmail.com>,
        devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH] staging: vt6656: Use defines in preamble_type variables
Date:   Sat, 28 Mar 2020 15:09:55 +0100
Message-Id: <20200328140955.23615-1-oscar.carter@gmx.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Use the PREAMBLE_SHORT and PREAMBLE_LONG defines present in the file
"baseband.h" to assign values to preamble_type variables. Also, use the
same defines to make comparisons against this variables.

In this way, avoid the use of numerical literals or boolean values and
make the code more clear.

Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
=2D--
 drivers/staging/vt6656/baseband.c | 8 ++++----
 drivers/staging/vt6656/main_usb.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/ba=
seband.c
index a19a563d8bcc..9bbafa7fff61 100644
=2D-- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -142,7 +142,7 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 p=
kt_type,
 	rate =3D (unsigned int)vnt_frame_time[tx_rate];

 	if (tx_rate <=3D 3) {
-		if (preamble_type =3D=3D 1)
+		if (preamble_type =3D=3D PREAMBLE_SHORT)
 			preamble =3D 96;
 		else
 			preamble =3D 192;
@@ -198,7 +198,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 f=
rame_length,
 	case RATE_2M:
 		count =3D bit_count / 2;

-		if (preamble_type =3D=3D 1)
+		if (preamble_type =3D=3D PREAMBLE_SHORT)
 			phy->signal =3D 0x09;
 		else
 			phy->signal =3D 0x01;
@@ -207,7 +207,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 f=
rame_length,
 	case RATE_5M:
 		count =3D DIV_ROUND_UP(bit_count * 10, 55);

-		if (preamble_type =3D=3D 1)
+		if (preamble_type =3D=3D PREAMBLE_SHORT)
 			phy->signal =3D 0x0a;
 		else
 			phy->signal =3D 0x02;
@@ -224,7 +224,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 f=
rame_length,
 				ext_bit =3D true;
 		}

-		if (preamble_type =3D=3D 1)
+		if (preamble_type =3D=3D PREAMBLE_SHORT)
 			phy->signal =3D 0x0b;
 		else
 			phy->signal =3D 0x03;
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/ma=
in_usb.c
index 8e7269c87ea9..dd89f98cc18c 100644
=2D-- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -99,7 +99,7 @@ static void vnt_set_options(struct vnt_private *priv)
 	priv->op_mode =3D NL80211_IFTYPE_UNSPECIFIED;
 	priv->bb_type =3D BBP_TYPE_DEF;
 	priv->packet_type =3D priv->bb_type;
-	priv->preamble_type =3D 0;
+	priv->preamble_type =3D PREAMBLE_LONG;
 	priv->exist_sw_net_addr =3D false;
 }

@@ -721,10 +721,10 @@ static void vnt_bss_info_changed(struct ieee80211_hw=
 *hw,
 	if (changed & BSS_CHANGED_ERP_PREAMBLE) {
 		if (conf->use_short_preamble) {
 			vnt_mac_enable_barker_preamble_mode(priv);
-			priv->preamble_type =3D true;
+			priv->preamble_type =3D PREAMBLE_SHORT;
 		} else {
 			vnt_mac_disable_barker_preamble_mode(priv);
-			priv->preamble_type =3D false;
+			priv->preamble_type =3D PREAMBLE_LONG;
 		}
 	}

=2D-
2.20.1