staging: r8188eu: remove MAX_CHANNEL_NUM_2G

The constants MAX_CHANNEL_NUM_2G and MAX_CHANNEL_NUM have the same
value. Remove MAX_CHANNEL_NUM_2G and fix the place where it is used.

Acked-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220102131141.12310-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 5b307ad3afa5d485e4d031526860d9ab03966265..afdbc5e28fca0f7cd182b95d821b735f5171a65c 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -163,7 +163,7 @@ struct rt_channel_plan {
 };
 
 struct rt_channel_plan_2g {
-       unsigned char   Channel[MAX_CHANNEL_NUM_2G];
+       unsigned char   Channel[MAX_CHANNEL_NUM];
        unsigned char   Len;
 };
 

diff --git a/drivers/staging/r8188eu/include/rtw_rf.h b/drivers/staging/r8188eu/include/rtw_rf.h
index d0a408b903dc3873b7e633e5798c0f16c09efd10..2308a00b5dec2ed6ac762565370df88c54c58cdb 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_rf.h
+++ b/drivers/staging/r8188eu/include/rtw_rf.h
@@ -19,11 +19,6 @@
 #define RTL8711_RF_MAX_SENS            6
 #define RTL8711_RF_DEF_SENS            4
 
-/*  We now define the following channels as the max channels in each
- * channel plan. */
-/*  2G, total 14 chnls */
-/*  {1,2,3,4,5,6,7,8,9,10,11,12,13,14} */
-#define        MAX_CHANNEL_NUM_2G              14
 #define        MAX_CHANNEL_NUM                 14      /* 2.4 GHz only */
 
 #define NUM_REGULATORYS        1