Commit 10b674be authored by Oscar Carter's avatar Oscar Carter Committed by Greg Kroah-Hartman

staging: vt6656: Remove duplicate code in vnt_rf_table_download

Replace three while loops with three calls to the vnt_control_out_blocks
function. This way avoid repeat a functionality that already exists.

Also remove the variables that now are not used.
Signed-off-by: default avatarOscar Carter <oscar.carter@gmx.com>
Link: https://lore.kernel.org/r/20200425151747.8199-4-oscar.carter@gmx.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d78b62c3
...@@ -762,7 +762,6 @@ int vnt_rf_table_download(struct vnt_private *priv) ...@@ -762,7 +762,6 @@ int vnt_rf_table_download(struct vnt_private *priv)
int ret; int ret;
u16 length1 = 0, length2 = 0, length3 = 0; u16 length1 = 0, length2 = 0, length3 = 0;
u8 *addr1 = NULL, *addr2 = NULL, *addr3 = NULL; u8 *addr1 = NULL, *addr2 = NULL, *addr3 = NULL;
u16 length, value;
switch (priv->rf_type) { switch (priv->rf_type) {
case RF_AL2230: case RF_AL2230:
...@@ -815,40 +814,14 @@ int vnt_rf_table_download(struct vnt_private *priv) ...@@ -815,40 +814,14 @@ int vnt_rf_table_download(struct vnt_private *priv)
return ret; return ret;
/* Channel Table 0 */ /* Channel Table 0 */
value = 0; ret = vnt_control_out_blocks(priv, VNT_REG_BLOCK_SIZE,
while (length2 > 0) { MESSAGE_REQUEST_RF_CH0, length2, addr2);
if (length2 >= 64) if (ret)
length = 64; return ret;
else
length = length2;
ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, value,
MESSAGE_REQUEST_RF_CH0, length, addr2);
if (ret)
return ret;
length2 -= length;
value += length;
addr2 += length;
}
/* Channel table 1 */
value = 0;
while (length3 > 0) {
if (length3 >= 64)
length = 64;
else
length = length3;
ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, value,
MESSAGE_REQUEST_RF_CH1, length, addr3);
if (ret)
return ret;
length3 -= length; /* Channel Table 1 */
value += length; ret = vnt_control_out_blocks(priv, VNT_REG_BLOCK_SIZE,
addr3 += length; MESSAGE_REQUEST_RF_CH1, length3, addr3);
}
if (priv->rf_type == RF_AIROHA7230) { if (priv->rf_type == RF_AIROHA7230) {
length1 = CB_AL7230_INIT_SEQ * 3; length1 = CB_AL7230_INIT_SEQ * 3;
...@@ -862,25 +835,11 @@ int vnt_rf_table_download(struct vnt_private *priv) ...@@ -862,25 +835,11 @@ int vnt_rf_table_download(struct vnt_private *priv)
if (ret) if (ret)
return ret; return ret;
/* Channel Table 0 */ /* Channel Table 2 */
value = 0; ret = vnt_control_out_blocks(priv, VNT_REG_BLOCK_SIZE,
while (length2 > 0) { MESSAGE_REQUEST_RF_CH2, length2,
if (length2 >= 64) addr2);
length = 64;
else
length = length2;
ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, value,
MESSAGE_REQUEST_RF_CH2, length,
addr2);
if (ret)
return ret;
length2 -= length;
value += length;
addr2 += length;
}
} }
return 0; return ret;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment