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.
Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
---
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/r8188eu/include/rtw_rf.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 5b307ad3afa5..afdbc5e28fca 100644
--- 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 d0a408b903dc..2308a00b5dec 100644
--- 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
--
2.34.1
