staging: rtl8188eu: remove include/rtw_debug.h header

Remove include/rtw_debug.h header file, as this isn't used and gets
rid of the various other definitions we don't need. Also move the
DRIVERVERSION constant value directly to os_dep/os_intfs.c as it is
only used there anyway. This results in removal of more unnecessary code.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210625000756.6313-24-phil@philpotter.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index 4116051a9a654f764127d643033343646bc963bb..3609a44ed078292703961920ee5e3be952deace8 100644 (file)
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -34,7 +34,6 @@ struct qos_priv {
 };
 
 #include <rtw_mlme.h>
-#include <rtw_debug.h>
 #include <rtw_rf.h>
 #include <rtw_event.h>
 #include <rtw_led.h>

diff --git a/drivers/staging/rtl8188eu/include/rtw_debug.h b/drivers/staging/rtl8188eu/include/rtw_debug.h
deleted file mode 100644 (file)
index 0de6d7b..0000000
--- a/drivers/staging/rtl8188eu/include/rtw_debug.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- ******************************************************************************/
-#ifndef __RTW_DEBUG_H__
-#define __RTW_DEBUG_H__
-
-#include <osdep_service.h>
-#include <drv_types.h>
-
-#define DRIVERVERSION  "v4.1.4_6773.20130222"
-#define _drv_always_                   1
-#define _drv_emerg_                    2
-#define _drv_alert_                    3
-#define _drv_crit_                     4
-#define _drv_err_                      5
-#define        _drv_warning_                   6
-#define _drv_notice_                   7
-#define _drv_info_                     8
-#define        _drv_debug_                     9
-
-#define _module_rtl871x_xmit_c_                BIT(0)
-#define _module_xmit_osdep_c_          BIT(1)
-#define _module_rtl871x_recv_c_                BIT(2)
-#define _module_recv_osdep_c_          BIT(3)
-#define _module_rtl871x_mlme_c_                BIT(4)
-#define _module_mlme_osdep_c_          BIT(5)
-#define _module_rtl871x_sta_mgt_c_     BIT(6)
-#define _module_rtl871x_cmd_c_         BIT(7)
-#define _module_cmd_osdep_c_           BIT(8)
-#define _module_rtl871x_io_c_          BIT(9)
-#define _module_io_osdep_c_            BIT(10)
-#define _module_os_intfs_c_            BIT(11)
-#define _module_rtl871x_security_c_    BIT(12)
-#define _module_rtl871x_eeprom_c_      BIT(13)
-#define _module_hal_init_c_            BIT(14)
-#define _module_hci_hal_init_c_                BIT(15)
-#define _module_rtl871x_ioctl_c_       BIT(16)
-#define _module_rtl871x_ioctl_set_c_   BIT(17)
-#define _module_rtl871x_ioctl_query_c_ BIT(18)
-#define _module_rtl871x_pwrctrl_c_     BIT(19)
-#define _module_hci_intfs_c_           BIT(20)
-#define _module_hci_ops_c_             BIT(21)
-#define _module_osdep_service_c_       BIT(22)
-#define _module_mp_                    BIT(23)
-#define _module_hci_ops_os_c_          BIT(24)
-#define _module_rtl871x_ioctl_os_c     BIT(25)
-#define _module_rtl8712_cmd_c_         BIT(26)
-#define        _module_rtl8192c_xmit_c_        BIT(27)
-#define _module_hal_xmit_c_            BIT(28)
-#define _module_efuse_                 BIT(29)
-#define _module_rtl8712_recv_c_                BIT(30)
-#define _module_rtl8712_led_c_         BIT(31)
-
-#endif /* __RTW_DEBUG_H__ */

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index c1e2f98293673fd62921ceb5f4abd04260d36cf6..b958a8d882b09b421de20844c5b93dac7a9270ec 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -11,7 +11,6 @@
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wlan_bssdef.h>
-#include <rtw_debug.h>
 #include <wifi.h>
 #include <rtw_mlme.h>
 #include <rtw_mlme_ext.h>

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index da372936a64c79b5d7faf9e80e17560c77ed121f..423c382e3d20e80bc2a0fc76b05e06147aaf0d98 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -18,7 +18,7 @@
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
 MODULE_AUTHOR("Realtek Semiconductor Corp.");
-MODULE_VERSION(DRIVERVERSION);
+MODULE_VERSION("v4.1.4_6773.20130222");
 MODULE_FIRMWARE("rtlwifi/rtl8188eufw.bin");
 
 #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */

diff --git a/drivers/staging/rtl8188eu/os_dep/rtw_android.c b/drivers/staging/rtl8188eu/os_dep/rtw_android.c
index 298517530ed35a76d5e390642d6080a46f07e3f7..3c5446999686729a9d95524448f024d35e643bb6 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/rtw_android.c
+++ b/drivers/staging/rtl8188eu/os_dep/rtw_android.c
@@ -10,7 +10,6 @@
 
 #include <rtw_android.h>
 #include <osdep_service.h>
-#include <rtw_debug.h>
 #include <rtw_ioctl_set.h>
 
 static const char *android_wifi_cmd_str[ANDROID_WIFI_CMD_MAX] = {