summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarolina Drobnik <karolinadrobnik@gmail.com>2021-11-15 13:55:45 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-17 15:55:32 +0300
commit9064cb02ee20a028675cedd2e30af3714e331866 (patch)
treefe850c7d3161b14415f0ffd06eff48108b7a7f49
parent460228f19bbc0a40c03f154ffdf441d969ad59d1 (diff)
downloadlinux-9064cb02ee20a028675cedd2e30af3714e331866.tar.xz
staging: vt6655: Rewrite conditional in AL7320 initialization
Use conditional operator to determine which table for AL7320 initialization should be used. Introduce `init_table` variable to store this value. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Karolina Drobnik <karolinadrobnik@gmail.com> Link: https://lore.kernel.org/r/28169210bc26d5fcc1080ed18dc8e043bc3ef30b.1636729147.git.karolinadrobnik@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6655/rf.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index ce91a03eb58f..5246ba211ffb 100644
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -684,6 +684,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
unsigned char init_count = 0;
unsigned char sleep_count = 0;
unsigned short idx = MISCFIFO_SYNDATA_IDX;
+ const unsigned long *init_table;
VNSvOutPortW(iobase + MAC_REG_MISCFFNDEX, 0);
switch (rf_type) {
@@ -714,13 +715,10 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
if (init_count > (MISCFIFO_SYNDATASIZE - sleep_count))
return false;
- if (channel <= CB_MAX_CHANNEL_24G) {
- for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
- MACvSetMISCFifo(priv, idx++, al7230_init_table[i]);
- } else {
- for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
- MACvSetMISCFifo(priv, idx++, al7230_init_table_a_mode[i]);
- }
+ init_table = (channel <= CB_MAX_CHANNEL_24G) ?
+ al7230_init_table : al7230_init_table_a_mode;
+ for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
+ MACvSetMISCFifo(priv, idx++, init_table[i]);
MACvSetMISCFifo(priv, idx++, al7230_channel_table0[channel - 1]);
MACvSetMISCFifo(priv, idx++, al7230_channel_table1[channel - 1]);