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:     Malcolm Priestley <tvboxspy@gmail.com>,
        Oscar Carter <oscar.carter@gmx.com>,
        Quentin Deslandes <quentin.deslandes@itdev.co.uk>,
        devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH] staging: vt6656: Return error code in vnt_rf_write_embedded function
Date:   Mon, 13 Apr 2020 12:19:31 +0200
Message-Id: <20200413101931.6334-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 error code returned by the vnt_control_out function as the
returned value of the vnt_rf_write_embedded function instead of a
boolean value.

Then, fix all vnt_rf_write_embedded calls removing the "and" operations
and replace with a direct assignment to the ret variable and add a check
condition after every call.

Also replace the boolean values true or false in the vnt_rf_set_txpower
function to 0 or error code EINVAL to follow the coding style guide.

The vnt_rf_set_txpower function is called only in the vnt_rf_setpower
function that already returns error codes. The calls to this function
(vnt_rf_set_txpower) not use the returned values, so they not need to be
fixed.

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

diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 4f9aba0f21b0..5270ef511af9 100644
=2D-- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -21,6 +21,7 @@
  *
  */

+#include <linux/errno.h>
 #include "mac.h"
 #include "rf.h"
 #include "baseband.h"
@@ -531,10 +532,8 @@ int vnt_rf_write_embedded(struct vnt_private *priv, u=
32 data)
 	reg_data[2] =3D (u8)(data >> 16);
 	reg_data[3] =3D (u8)(data >> 24);

-	vnt_control_out(priv, MESSAGE_TYPE_WRITE_IFRF,
-			0, 0, ARRAY_SIZE(reg_data), reg_data);
-
-	return true;
+	return vnt_control_out(priv, MESSAGE_TYPE_WRITE_IFRF, 0, 0,
+			       ARRAY_SIZE(reg_data), reg_data);
 }

 /* Set Tx power by rate and channel number */
@@ -603,14 +602,14 @@ static u8 vnt_rf_addpower(struct vnt_private *priv)
 int vnt_rf_set_txpower(struct vnt_private *priv, u8 power, u32 rate)
 {
 	u32 power_setting =3D 0;
-	int ret =3D true;
+	int ret =3D 0;

 	power +=3D vnt_rf_addpower(priv);
 	if (power > VNT_RF_MAX_POWER)
 		power =3D VNT_RF_MAX_POWER;

 	if (priv->power =3D=3D power)
-		return true;
+		return 0;

 	priv->power =3D power;

@@ -618,35 +617,50 @@ int vnt_rf_set_txpower(struct vnt_private *priv, u8 =
power, u32 rate)
 	case RF_AL2230:
 		power_setting =3D 0x0404090 | (power << 12);

-		ret &=3D vnt_rf_write_embedded(priv, power_setting);
+		ret =3D vnt_rf_write_embedded(priv, power_setting);
+		if (ret)
+			return ret;

 		if (rate <=3D RATE_11M)
-			ret &=3D vnt_rf_write_embedded(priv, 0x0001b400);
+			ret =3D vnt_rf_write_embedded(priv, 0x0001b400);
 		else
-			ret &=3D vnt_rf_write_embedded(priv, 0x0005a400);
+			ret =3D vnt_rf_write_embedded(priv, 0x0005a400);
+
 		break;
 	case RF_AL2230S:
 		power_setting =3D 0x0404090 | (power << 12);

-		ret &=3D vnt_rf_write_embedded(priv, power_setting);
+		ret =3D vnt_rf_write_embedded(priv, power_setting);
+		if (ret)
+			return ret;

 		if (rate <=3D RATE_11M) {
-			ret &=3D vnt_rf_write_embedded(priv, 0x040c1400);
-			ret &=3D vnt_rf_write_embedded(priv, 0x00299b00);
+			ret =3D vnt_rf_write_embedded(priv, 0x040c1400);
+			if (ret)
+				return ret;
+
+			ret =3D vnt_rf_write_embedded(priv, 0x00299b00);
 		} else {
-			ret &=3D vnt_rf_write_embedded(priv, 0x0005a400);
-			ret &=3D vnt_rf_write_embedded(priv, 0x00099b00);
+			ret =3D vnt_rf_write_embedded(priv, 0x0005a400);
+			if (ret)
+				return ret;
+
+			ret =3D vnt_rf_write_embedded(priv, 0x00099b00);
 		}
+
 		break;

 	case RF_AIROHA7230:
 		if (rate <=3D RATE_11M)
-			ret &=3D vnt_rf_write_embedded(priv, 0x111bb900);
+			ret =3D vnt_rf_write_embedded(priv, 0x111bb900);
 		else
-			ret &=3D vnt_rf_write_embedded(priv, 0x221bb900);
+			ret =3D vnt_rf_write_embedded(priv, 0x221bb900);
+
+		if (ret)
+			return ret;

 		if (power >=3D AL7230_PWR_IDX_LEN)
-			return false;
+			return -EINVAL;

 		/*
 		 * 0x080F1B00 for 3 wire control TxGain(D10)
@@ -654,61 +668,76 @@ int vnt_rf_set_txpower(struct vnt_private *priv, u8 =
power, u32 rate)
 		 */
 		power_setting =3D 0x080c0b00 | (power << 12);

-		ret &=3D vnt_rf_write_embedded(priv, power_setting);
-
+		ret =3D vnt_rf_write_embedded(priv, power_setting);
 		break;

 	case RF_VT3226:
 		if (power >=3D VT3226_PWR_IDX_LEN)
-			return false;
+			return -EINVAL;
 		power_setting =3D ((0x3f - power) << 20) | (0x17 << 8);

-		ret &=3D vnt_rf_write_embedded(priv, power_setting);
-
+		ret =3D vnt_rf_write_embedded(priv, power_setting);
 		break;
 	case RF_VT3226D0:
 		if (power >=3D VT3226_PWR_IDX_LEN)
-			return false;
+			return -EINVAL;

 		if (rate <=3D RATE_11M) {
 			u16 hw_value =3D priv->hw->conf.chandef.chan->hw_value;

 			power_setting =3D ((0x3f - power) << 20) | (0xe07 << 8);

-			ret &=3D vnt_rf_write_embedded(priv, power_setting);
-			ret &=3D vnt_rf_write_embedded(priv, 0x03c6a200);
+			ret =3D vnt_rf_write_embedded(priv, power_setting);
+			if (ret)
+				return ret;
+
+			ret =3D vnt_rf_write_embedded(priv, 0x03c6a200);
+			if (ret)
+				return ret;

 			dev_dbg(&priv->usb->dev,
 				"%s 11b channel [%d]\n", __func__, hw_value);

 			hw_value--;

-			if (hw_value < ARRAY_SIZE(vt3226d0_lo_current_table))
-				ret &=3D vnt_rf_write_embedded(priv,
+			if (hw_value < ARRAY_SIZE(vt3226d0_lo_current_table)) {
+				ret =3D vnt_rf_write_embedded(priv,
 					vt3226d0_lo_current_table[hw_value]);
+				if (ret)
+					return ret;
+			}

-			ret &=3D vnt_rf_write_embedded(priv, 0x015C0800);
+			ret =3D vnt_rf_write_embedded(priv, 0x015C0800);
 		} else {
 			dev_dbg(&priv->usb->dev,
 				"@@@@ %s> 11G mode\n", __func__);

 			power_setting =3D ((0x3f - power) << 20) | (0x7 << 8);

-			ret &=3D vnt_rf_write_embedded(priv, power_setting);
-			ret &=3D vnt_rf_write_embedded(priv, 0x00C6A200);
-			ret &=3D vnt_rf_write_embedded(priv, 0x016BC600);
-			ret &=3D vnt_rf_write_embedded(priv, 0x00900800);
+			ret =3D vnt_rf_write_embedded(priv, power_setting);
+			if (ret)
+				return ret;
+
+			ret =3D vnt_rf_write_embedded(priv, 0x00C6A200);
+			if (ret)
+				return ret;
+
+			ret =3D vnt_rf_write_embedded(priv, 0x016BC600);
+			if (ret)
+				return ret;
+
+			ret =3D vnt_rf_write_embedded(priv, 0x00900800);
 		}
+
 		break;

 	case RF_VT3342A0:
 		if (power >=3D VT3342_PWR_IDX_LEN)
-			return false;
+			return -EINVAL;

 		power_setting =3D  ((0x3f - power) << 20) | (0x27 << 8);

-		ret &=3D vnt_rf_write_embedded(priv, power_setting);
-
+		ret =3D vnt_rf_write_embedded(priv, power_setting);
 		break;
 	default:
 		break;
=2D-
2.20.1