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:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Forest Bond <forest@alittletooquiet.net>
Cc:     Quentin Deslandes <quentin.deslandes@itdev.co.uk>,
        Malcolm Priestley <tvboxspy@gmail.com>,
        Colin Ian King <colin.king@canonical.com>,
        Gabriela Bittencourt <gabrielabittencourt00@gmail.com>,
        Oscar Carter <oscar.carter@gmx.com>,
        devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH] staging: vt6656: Use ARRAY_SIZE instead of hardcoded size
Date:   Sat, 14 Mar 2020 17:47:54 +0100
Message-Id: <20200314164754.8531-1-oscar.carter@gmx.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Use ARRAY_SIZE to replace the hardcoded size so we will never have a
mismatch.

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

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/ma=
in_usb.c
index 5e48b3ddb94c..4370941ffc04 100644
=2D-- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -23,6 +23,7 @@

 #include <linux/etherdevice.h>
 #include <linux/file.h>
+#include <linux/kernel.h>
 #include "device.h"
 #include "card.h"
 #include "baseband.h"
@@ -116,6 +117,7 @@ static int vnt_init_registers(struct vnt_private *priv=
)
 	int ii;
 	u8 tmp;
 	u8 calib_tx_iq =3D 0, calib_tx_dc =3D 0, calib_rx_iq =3D 0;
+	const int n_cck_pwr_tbl =3D ARRAY_SIZE(priv->cck_pwr_tbl);

 	dev_dbg(&priv->usb->dev, "---->INIbInitAdapter. [%d][%d]\n",
 		DEVICE_INIT_COLD, priv->packet_type);
@@ -145,7 +147,7 @@ static int vnt_init_registers(struct vnt_private *priv=
)

 	init_cmd->init_class =3D DEVICE_INIT_COLD;
 	init_cmd->exist_sw_net_addr =3D priv->exist_sw_net_addr;
-	for (ii =3D 0; ii < 6; ii++)
+	for (ii =3D 0; ii < ARRAY_SIZE(init_cmd->sw_net_addr); ii++)
 		init_cmd->sw_net_addr[ii] =3D priv->current_net_addr[ii];
 	init_cmd->short_retry_limit =3D priv->short_retry_limit;
 	init_cmd->long_retry_limit =3D priv->long_retry_limit;
@@ -184,7 +186,7 @@ static int vnt_init_registers(struct vnt_private *priv=
)
 	priv->cck_pwr =3D priv->eeprom[EEP_OFS_PWR_CCK];
 	priv->ofdm_pwr_g =3D priv->eeprom[EEP_OFS_PWR_OFDMG];
 	/* load power table */
-	for (ii =3D 0; ii < 14; ii++) {
+	for (ii =3D 0; ii < n_cck_pwr_tbl; ii++) {
 		priv->cck_pwr_tbl[ii] =3D
 			priv->eeprom[ii + EEP_OFS_CCK_PWR_TBL];
 		if (priv->cck_pwr_tbl[ii] =3D=3D 0)
@@ -200,7 +202,7 @@ static int vnt_init_registers(struct vnt_private *priv=
)
 	 * original zonetype is USA, but custom zonetype is Europe,
 	 * then need to recover 12, 13, 14 channels with 11 channel
 	 */
-	for (ii =3D 11; ii < 14; ii++) {
+	for (ii =3D 11; ii < n_cck_pwr_tbl; ii++) {
 		priv->cck_pwr_tbl[ii] =3D priv->cck_pwr_tbl[10];
 		priv->ofdm_pwr_tbl[ii] =3D priv->ofdm_pwr_tbl[10];
 	}
=2D-
2.20.1