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 5/5] staging: vt6656: Remove duplicate code for the phy->service assignment
Date:   Tue, 14 Apr 2020 17:38:49 +0200
Message-Id: <20200414153849.5785-6-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

Take out the "phy->service" assignment from the if-else statement due to
it's the same for the two branches.

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

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/ba=
seband.c
index 3b6f2bcf91a7..13b91d7fc6db 100644
=2D-- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -320,14 +320,13 @@ void vnt_get_phy_field(struct vnt_private *priv, u32=
 frame_length,

 	i =3D tx_rate > RATE_54M ? RATE_54M : tx_rate;
 	phy->signal =3D vnt_phy_signal[i] | mask;
+	phy->service =3D 0x00;

 	if (pkt_type =3D=3D PK_TYPE_11B) {
-		phy->service =3D 0x00;
 		if (ext_bit)
 			phy->service |=3D 0x80;
 		phy->len =3D cpu_to_le16((u16)count);
 	} else {
-		phy->service =3D 0x00;
 		phy->len =3D cpu_to_le16((u16)frame_length);
 	}
 }
=2D-
2.20.1