staging: rtl8192e: Remove constant variable chnl_plan

Remove constant variable chnl_plan and replace it with its constant.
Remove equation that limits maximum value of chnl_plan as it is always
false.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/e46f16227877fe9853c9d15992e7fd27a0ceeae6.1700296319.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 44898e0be21c564783c3341a722fff96d9bedcec..9b51deba149b89e4a12574ba2331201cb80a6b18 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -396,8 +396,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                break;
        }
 
-       priv->chnl_plan = COUNTRY_CODE_WORLD_WIDE_13;
-
        if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
                priv->rtllib->bSupportRemoteWakeUp = true;
        else

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 2789f428e4f9410574b277f03cacb0e9bb404910..68bd035002675c67e45c4a2d8c78a117acf411c6 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -795,13 +795,8 @@ static short _rtl92e_get_channel_map(struct net_device *dev)
 
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       if (priv->chnl_plan >= COUNTRY_CODE_MAX) {
-               netdev_info(dev,
-                           "rtl819x_init:Error channel plan! Set to default.\n");
-               priv->chnl_plan = COUNTRY_CODE_FCC;
-       }
        dot11d_init(priv->rtllib);
-       dot11d_channel_map(priv->chnl_plan, priv->rtllib);
+       dot11d_channel_map(COUNTRY_CODE_WORLD_WIDE_13, priv->rtllib);
        for (i = 1; i <= 11; i++)
                (priv->rtllib->active_channel_map)[i] = 1;
        (priv->rtllib->active_channel_map)[12] = 2;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 348df71e122e98f524fef94a78849829cd57f474..addaa1eb39eeff7e499293a6a6427960e8e08b05 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -310,7 +310,6 @@ struct r8192_priv {
 
        bool tx_pwr_data_read_from_eeprom;
 
-       u16 chnl_plan;
        u8 hw_rf_off_action;
 
        bool rf_change_in_progress;