staging: vt6656: Use defines in preamble_type variables

Use the PREAMBLE_SHORT and PREAMBLE_LONG defines present in the file
"baseband.h" to assign values to preamble_type variables. Also, use the
same defines to make comparisons against these variables.

In this way, avoid the use of numerical literals or boolean values and
make the code more clear.

Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
Reviewed-by: Quentin Deslandes <quentin.deslandes@itdev.co.uk>
Link: https://lore.kernel.org/r/20200328141738.23810-1-oscar.carter@gmx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index a19a563d8bccb7f7a1eb7296fcb61e61e1252f48..9bbafa7fff612a8cf5b531767e2b330c7a6cc3f7 100644 (file)
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -142,7 +142,7 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type,
        rate = (unsigned int)vnt_frame_time[tx_rate];
 
        if (tx_rate <= 3) {
-               if (preamble_type == 1)
+               if (preamble_type == PREAMBLE_SHORT)
                        preamble = 96;
                else
                        preamble = 192;
@@ -198,7 +198,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
        case RATE_2M:
                count = bit_count / 2;
 
-               if (preamble_type == 1)
+               if (preamble_type == PREAMBLE_SHORT)
                        phy->signal = 0x09;
                else
                        phy->signal = 0x01;
@@ -207,7 +207,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
        case RATE_5M:
                count = DIV_ROUND_UP(bit_count * 10, 55);
 
-               if (preamble_type == 1)
+               if (preamble_type == PREAMBLE_SHORT)
                        phy->signal = 0x0a;
                else
                        phy->signal = 0x02;
@@ -224,7 +224,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
                                ext_bit = true;
                }
 
-               if (preamble_type == 1)
+               if (preamble_type == PREAMBLE_SHORT)
                        phy->signal = 0x0b;
                else
                        phy->signal = 0x03;

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 8e7269c87ea96b8a4c073ada02f44ac7b5b2b647..dd89f98cc18cedb89657ac5778ac09780382df3e 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -99,7 +99,7 @@ static void vnt_set_options(struct vnt_private *priv)
        priv->op_mode = NL80211_IFTYPE_UNSPECIFIED;
        priv->bb_type = BBP_TYPE_DEF;
        priv->packet_type = priv->bb_type;
-       priv->preamble_type = 0;
+       priv->preamble_type = PREAMBLE_LONG;
        priv->exist_sw_net_addr = false;
 }
 
@@ -721,10 +721,10 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                if (conf->use_short_preamble) {
                        vnt_mac_enable_barker_preamble_mode(priv);
-                       priv->preamble_type = true;
+                       priv->preamble_type = PREAMBLE_SHORT;
                } else {
                        vnt_mac_disable_barker_preamble_mode(priv);
-                       priv->preamble_type = false;
+                       priv->preamble_type = PREAMBLE_LONG;
                }
        }