* [PATCH 0/8] staging: r8188eu: some simple cleanups
@ 2022-04-07 19:28 Michael Straube
2022-04-07 19:28 ` [PATCH 1/8] staging: r8188eu: remove unused macros from basic_types.h Michael Straube
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Some simple cleanups. Most of them are removing unused macros,
structures, etc. from header files.
Michael Straube (8):
staging: r8188eu: remove unused macros from basic_types.h
staging: r8188eu: move struct rt_firmware to rtw_fw.h
staging: r8188eu: ROMVer is always zero
staging: r8188eu: remove unused fields from struct eeprom_priv
staging: r8188eu: remove unused enums from odm.h
staging: r8188eu: remove unused prototype usbvendorrequest()
staging: r8188eu: remove header usb_vendor_req.h
staging: r8188eu: clean up rtw_ioctl.h
drivers/staging/r8188eu/hal/hal_com.c | 2 +-
.../staging/r8188eu/hal/rtl8188e_hal_init.c | 1 -
drivers/staging/r8188eu/include/HalVerDef.h | 1 -
drivers/staging/r8188eu/include/basic_types.h | 73 +----------------
drivers/staging/r8188eu/include/drv_types.h | 6 +-
drivers/staging/r8188eu/include/odm.h | 29 -------
drivers/staging/r8188eu/include/rtw_eeprom.h | 3 -
drivers/staging/r8188eu/include/rtw_fw.h | 5 ++
drivers/staging/r8188eu/include/rtw_ioctl.h | 79 -------------------
drivers/staging/r8188eu/include/usb_osintf.h | 4 -
.../staging/r8188eu/include/usb_vendor_req.h | 35 --------
drivers/staging/r8188eu/os_dep/usb_intf.c | 1 -
12 files changed, 8 insertions(+), 231 deletions(-)
delete mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h
--
2.35.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/8] staging: r8188eu: remove unused macros from basic_types.h
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
2022-04-07 19:28 ` [PATCH 2/8] staging: r8188eu: move struct rt_firmware to rtw_fw.h Michael Straube
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused macros from basic_types.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/basic_types.h | 73 +------------------
1 file changed, 1 insertion(+), 72 deletions(-)
diff --git a/drivers/staging/r8188eu/include/basic_types.h b/drivers/staging/r8188eu/include/basic_types.h
index d82b2171d584..ffb21170e898 100644
--- a/drivers/staging/r8188eu/include/basic_types.h
+++ b/drivers/staging/r8188eu/include/basic_types.h
@@ -4,9 +4,6 @@
#ifndef __BASIC_TYPES_H__
#define __BASIC_TYPES_H__
-#define SUCCESS 0
-#define FAIL (-1)
-
#include <linux/types.h>
#define NDIS_OID uint
@@ -14,9 +11,6 @@ typedef void (*proc_t)(void *);
#define FIELD_OFFSET(s, field) ((ssize_t)&((s *)(0))->field)
-#define MEM_ALIGNMENT_OFFSET (sizeof(size_t))
-#define MEM_ALIGNMENT_PADDING (sizeof(size_t) - 1)
-
/* port from fw */
/* TODO: Macros Below are Sync from SD7-Driver. It is necessary
* to check correctness */
@@ -31,86 +25,21 @@ typedef void (*proc_t)(void *);
/* Convert little data endian to host ordering */
#define EF1BYTE(_val) \
((u8)(_val))
-#define EF2BYTE(_val) \
- (le16_to_cpu(_val))
-#define EF4BYTE(_val) \
- (le32_to_cpu(_val))
-
-/* Read data from memory */
-#define READEF1BYTE(_ptr) \
- EF1BYTE(*((u8 *)(_ptr)))
-/* Read le16 data from memory and convert to host ordering */
-#define READEF2BYTE(_ptr) \
- EF2BYTE(*(_ptr))
-#define READEF4BYTE(_ptr) \
- EF4BYTE(*(_ptr))
-/* Write data to memory */
-#define WRITEEF1BYTE(_ptr, _val) \
- do { \
- (*((u8 *)(_ptr))) = EF1BYTE(_val) \
- } while (0)
-/* Write le data to memory in host ordering */
-#define WRITEEF2BYTE(_ptr, _val) \
- do { \
- (*((u16 *)(_ptr))) = EF2BYTE(_val) \
- } while (0)
-
-#define WRITEEF4BYTE(_ptr, _val) \
- do { \
- (*((u32 *)(_ptr))) = EF2BYTE(_val) \
- } while (0)
-
-/* Create a bit mask
- * Examples:
- * BIT_LEN_MASK_32(0) => 0x00000000
- * BIT_LEN_MASK_32(1) => 0x00000001
- * BIT_LEN_MASK_32(2) => 0x00000003
- * BIT_LEN_MASK_32(32) => 0xFFFFFFFF
- */
-#define BIT_LEN_MASK_32(__bitlen) \
- (0xFFFFFFFF >> (32 - (__bitlen)))
-#define BIT_LEN_MASK_16(__bitlen) \
- (0xFFFF >> (16 - (__bitlen)))
+/* Create a bit mask */
#define BIT_LEN_MASK_8(__bitlen) \
(0xFF >> (8 - (__bitlen)))
-/* Create an offset bit mask
- * Examples:
- * BIT_OFFSET_LEN_MASK_32(0, 2) => 0x00000003
- * BIT_OFFSET_LEN_MASK_32(16, 2) => 0x00030000
- */
-#define BIT_OFFSET_LEN_MASK_32(__bitoffset, __bitlen) \
- (BIT_LEN_MASK_32(__bitlen) << (__bitoffset))
-#define BIT_OFFSET_LEN_MASK_16(__bitoffset, __bitlen) \
- (BIT_LEN_MASK_16(__bitlen) << (__bitoffset))
-#define BIT_OFFSET_LEN_MASK_8(__bitoffset, __bitlen) \
- (BIT_LEN_MASK_8(__bitlen) << (__bitoffset))
-
/*Description:
* Return 4-byte value in host byte ordering from
* 4-byte pointer in little-endian system.
*/
-#define LE_P4BYTE_TO_HOST_4BYTE(__pstart) \
- (EF4BYTE(*((__le32 *)(__pstart))))
-#define LE_P2BYTE_TO_HOST_2BYTE(__pstart) \
- (EF2BYTE(*((__le16 *)(__pstart))))
#define LE_P1BYTE_TO_HOST_1BYTE(__pstart) \
(EF1BYTE(*((u8 *)(__pstart))))
/*Description:
Translate subfield (continuous bits in little-endian) of 4-byte
value to host byte ordering.*/
-#define LE_BITS_TO_4BYTE(__pstart, __bitoffset, __bitlen) \
- ( \
- (LE_P4BYTE_TO_HOST_4BYTE(__pstart) >> (__bitoffset)) & \
- BIT_LEN_MASK_32(__bitlen) \
- )
-#define LE_BITS_TO_2BYTE(__pstart, __bitoffset, __bitlen) \
- ( \
- (LE_P2BYTE_TO_HOST_2BYTE(__pstart) >> (__bitoffset)) & \
- BIT_LEN_MASK_16(__bitlen) \
- )
#define LE_BITS_TO_1BYTE(__pstart, __bitoffset, __bitlen) \
( \
(LE_P1BYTE_TO_HOST_1BYTE(__pstart) >> (__bitoffset)) & \
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/8] staging: r8188eu: move struct rt_firmware to rtw_fw.h
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
2022-04-07 19:28 ` [PATCH 1/8] staging: r8188eu: remove unused macros from basic_types.h Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
2022-04-07 19:28 ` [PATCH 3/8] staging: r8188eu: ROMVer is always zero Michael Straube
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Move the rt_firmware structure to the header rtw_fw.h to have firmware
related things in one place.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/drv_types.h | 6 +-----
drivers/staging/r8188eu/include/rtw_fw.h | 5 +++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 09fc27082f7c..ffab2ee0848a 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -35,6 +35,7 @@
#include "rtw_ap.h"
#include "rtw_br_ext.h"
#include "rtl8188e_hal.h"
+#include "rtw_fw.h"
#define DRIVERVERSION "v4.1.4_6773.20130222"
@@ -116,11 +117,6 @@ struct registry_priv {
#define MAX_CONTINUAL_URB_ERR 4
-struct rt_firmware {
- u8 *data;
- u32 size;
-};
-
struct dvobj_priv {
struct adapter *if1;
diff --git a/drivers/staging/r8188eu/include/rtw_fw.h b/drivers/staging/r8188eu/include/rtw_fw.h
index c4b1a8370b4a..8f74157ee9ac 100644
--- a/drivers/staging/r8188eu/include/rtw_fw.h
+++ b/drivers/staging/r8188eu/include/rtw_fw.h
@@ -4,6 +4,11 @@
#ifndef __RTW_FW_H__
#define __RTW_FW_H__
+struct rt_firmware {
+ u8 *data;
+ u32 size;
+};
+
#include "drv_types.h"
int rtl8188e_firmware_download(struct adapter *padapter);
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/8] staging: r8188eu: ROMVer is always zero
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
2022-04-07 19:28 ` [PATCH 1/8] staging: r8188eu: remove unused macros from basic_types.h Michael Straube
2022-04-07 19:28 ` [PATCH 2/8] staging: r8188eu: move struct rt_firmware to rtw_fw.h Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
2022-04-07 19:28 ` [PATCH 4/8] staging: r8188eu: remove unused fields from struct eeprom_priv Michael Straube
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The variable ROMVer in struct HAL_VERSION is set to zero and never
changed. Remove it and replace its use with zero.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/hal_com.c | 2 +-
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 1 -
drivers/staging/r8188eu/include/HalVerDef.h | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/hal_com.c b/drivers/staging/r8188eu/hal/hal_com.c
index 7649f9919f67..910cc07f656c 100644
--- a/drivers/staging/r8188eu/hal/hal_com.c
+++ b/drivers/staging/r8188eu/hal/hal_com.c
@@ -44,7 +44,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers)
cnt += sprintf((buf + cnt), "1T1R_");
- cnt += sprintf((buf + cnt), "RomVer(%d)\n", chip_vers.ROMVer);
+ cnt += sprintf((buf + cnt), "RomVer(%d)\n", 0);
pr_info("%s", buf);
}
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 6811be95da9a..609138887b25 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -505,7 +505,6 @@ void rtl8188e_read_chip_version(struct adapter *padapter)
ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);
ChipVersion.CUTVersion = (value32 & CHIP_VER_RTL_MASK) >> CHIP_VER_RTL_SHIFT; /* IC version (CUT) */
- ChipVersion.ROMVer = 0; /* ROM code version. */
dump_chip_info(ChipVersion);
diff --git a/drivers/staging/r8188eu/include/HalVerDef.h b/drivers/staging/r8188eu/include/HalVerDef.h
index 56dadadb1a0f..7a530c7d57eb 100644
--- a/drivers/staging/r8188eu/include/HalVerDef.h
+++ b/drivers/staging/r8188eu/include/HalVerDef.h
@@ -25,7 +25,6 @@ struct HAL_VERSION {
enum HAL_CHIP_TYPE ChipType;
enum HAL_CUT_VERSION CUTVersion;
enum HAL_VENDOR VendorType;
- u8 ROMVer;
};
/* Get element */
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/8] staging: r8188eu: remove unused fields from struct eeprom_priv
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
` (2 preceding siblings ...)
2022-04-07 19:28 ` [PATCH 3/8] staging: r8188eu: ROMVer is always zero Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
2022-04-07 19:28 ` [PATCH 5/8] staging: r8188eu: remove unused enums from odm.h Michael Straube
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused fields from struct eeprom_priv.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/rtw_eeprom.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_eeprom.h b/drivers/staging/r8188eu/include/rtw_eeprom.h
index 3e8d3bb48903..d8d48ace356c 100644
--- a/drivers/staging/r8188eu/include/rtw_eeprom.h
+++ b/drivers/staging/r8188eu/include/rtw_eeprom.h
@@ -11,10 +11,7 @@
struct eeprom_priv {
u8 bautoload_fail_flag;
- u8 bloadfile_fail_flag;
- u8 bloadmac_fail_flag;
u8 mac_addr[ETH_ALEN] __aligned(2); /* PermanentAddress */
- u16 channel_plan;
u8 EepromOrEfuse;
u8 efuse_eeprom_data[HWSET_MAX_SIZE_512] __aligned(4);
};
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/8] staging: r8188eu: remove unused enums from odm.h
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
` (3 preceding siblings ...)
2022-04-07 19:28 ` [PATCH 4/8] staging: r8188eu: remove unused fields from struct eeprom_priv Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
2022-04-07 19:28 ` [PATCH 6/8] staging: r8188eu: remove unused prototype usbvendorrequest() Michael Straube
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused enums from odm.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/odm.h | 29 ---------------------------
1 file changed, 29 deletions(-)
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 1902aa48a255..f131e17167bf 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -98,22 +98,6 @@ struct odm_per_pkt_info {
bool bPacketBeacon;
};
-enum odm_ability {
- /* BB Team */
- ODM_DIG = 0x00000001,
- ODM_HIGH_POWER = 0x00000002,
- ODM_CCK_CCA_TH = 0x00000004,
- ODM_FA_STATISTICS = 0x00000008,
- ODM_RAMASK = 0x00000010,
- ODM_RSSI_MONITOR = 0x00000020,
- ODM_SW_ANTDIV = 0x00000040,
- ODM_HW_ANTDIV = 0x00000080,
- ODM_BB_PWRSV = 0x00000100,
- ODM_2TPATHDIV = 0x00000200,
- ODM_1TPATHDIV = 0x00000400,
- ODM_PSD2AFH = 0x00000800
-};
-
/* 2011/10/20 MH Define Common info enum for all team. */
enum odm_common_info_def {
@@ -137,19 +121,6 @@ enum odm_ability_def {
# define ODM_ITRF_USB 0x2
-/* ODM_CMNINFO_OP_MODE */
-enum odm_operation_mode {
- ODM_NO_LINK = BIT(0),
- ODM_LINK = BIT(1),
- ODM_SCAN = BIT(2),
- ODM_POWERSAVE = BIT(3),
- ODM_AP_MODE = BIT(4),
- ODM_CLIENT_MODE = BIT(5),
- ODM_AD_HOC = BIT(6),
- ODM_WIFI_DIRECT = BIT(7),
- ODM_WIFI_DISPLAY = BIT(8),
-};
-
/* ODM_CMNINFO_WM_MODE */
enum odm_wireless_mode {
ODM_WM_UNKNOW = 0x0,
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/8] staging: r8188eu: remove unused prototype usbvendorrequest()
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
` (4 preceding siblings ...)
2022-04-07 19:28 ` [PATCH 5/8] staging: r8188eu: remove unused enums from odm.h Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
2022-04-07 19:28 ` [PATCH 7/8] staging: r8188eu: remove header usb_vendor_req.h Michael Straube
2022-04-07 19:28 ` [PATCH 8/8] staging: r8188eu: clean up rtw_ioctl.h Michael Straube
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused prototype usbvendorrequest().
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/usb_osintf.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
index 3e777ca52745..32ca8ef95b23 100644
--- a/drivers/staging/r8188eu/include/usb_osintf.h
+++ b/drivers/staging/r8188eu/include/usb_osintf.h
@@ -13,9 +13,6 @@ extern int rtw_mc2u_disable;
#define USBD_HALTED(Status) ((u32)(Status) >> 30 == 3)
-u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest,
- enum rt_usb_wvalue wvalue, u8 windex, void *data,
- u8 datalen, u8 isdirectionin);
void netdev_br_init(struct net_device *netdev);
void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr);
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 7/8] staging: r8188eu: remove header usb_vendor_req.h
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
` (5 preceding siblings ...)
2022-04-07 19:28 ` [PATCH 6/8] staging: r8188eu: remove unused prototype usbvendorrequest() Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
2022-04-07 19:28 ` [PATCH 8/8] staging: r8188eu: clean up rtw_ioctl.h Michael Straube
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Nothing from the header usb_vendor_req.h is used in the driver code.
Remove the header.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/usb_osintf.h | 1 -
.../staging/r8188eu/include/usb_vendor_req.h | 35 -------------------
drivers/staging/r8188eu/os_dep/usb_intf.c | 1 -
3 files changed, 37 deletions(-)
delete mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h
diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
index 32ca8ef95b23..f271e93e9ab9 100644
--- a/drivers/staging/r8188eu/include/usb_osintf.h
+++ b/drivers/staging/r8188eu/include/usb_osintf.h
@@ -6,7 +6,6 @@
#include "osdep_service.h"
#include "drv_types.h"
-#include "usb_vendor_req.h"
extern char *rtw_initmac;
extern int rtw_mc2u_disable;
diff --git a/drivers/staging/r8188eu/include/usb_vendor_req.h b/drivers/staging/r8188eu/include/usb_vendor_req.h
deleted file mode 100644
index 7337b1b7419f..000000000000
--- a/drivers/staging/r8188eu/include/usb_vendor_req.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2007 - 2011 Realtek Corporation. */
-
-#ifndef _USB_VENDOR_REQUEST_H_
-#define _USB_VENDOR_REQUEST_H_
-
-/* 4 Set/Get Register related wIndex/Data */
-#define RT_USB_RESET_MASK_OFF 0
-#define RT_USB_RESET_MASK_ON 1
-#define RT_USB_SLEEP_MASK_OFF 0
-#define RT_USB_SLEEP_MASK_ON 1
-#define RT_USB_LDO_ON 1
-#define RT_USB_LDO_OFF 0
-
-/* 4 Set/Get SYSCLK related wValue or Data */
-#define RT_USB_SYSCLK_32KHZ 0
-#define RT_USB_SYSCLK_40MHZ 1
-#define RT_USB_SYSCLK_60MHZ 2
-
-enum bt_usb_request {
- RT_USB_SET_REGISTER = 1,
- RT_USB_SET_SYSCLK = 2,
- RT_USB_GET_SYSCLK = 3,
- RT_USB_GET_REGISTER = 4
-};
-
-enum rt_usb_wvalue {
- RT_USB_RESET_MASK = 1,
- RT_USB_SLEEP_MASK = 2,
- RT_USB_USB_HRCPWM = 3,
- RT_USB_LDO = 4,
- RT_USB_BOOT_TYPE = 5
-};
-
-#endif
diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index ffd727fb32e3..7bd5ab7e5248 100644
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -8,7 +8,6 @@
#include "../include/xmit_osdep.h"
#include "../include/hal_intf.h"
#include "../include/osdep_intf.h"
-#include "../include/usb_vendor_req.h"
#include "../include/usb_ops.h"
#include "../include/usb_osintf.h"
#include "../include/rtw_ioctl.h"
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 8/8] staging: r8188eu: clean up rtw_ioctl.h
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
` (6 preceding siblings ...)
2022-04-07 19:28 ` [PATCH 7/8] staging: r8188eu: remove header usb_vendor_req.h Michael Straube
@ 2022-04-07 19:28 ` Michael Straube
7 siblings, 0 replies; 9+ messages in thread
From: Michael Straube @ 2022-04-07 19:28 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
There are lots of unused macros, structs, etc. in the header
rtw_ioctl.h. Remove them.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/rtw_ioctl.h | 79 ---------------------
1 file changed, 79 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_ioctl.h b/drivers/staging/r8188eu/include/rtw_ioctl.h
index a36bd7313755..c704f3040ac8 100644
--- a/drivers/staging/r8188eu/include/rtw_ioctl.h
+++ b/drivers/staging/r8188eu/include/rtw_ioctl.h
@@ -7,86 +7,7 @@
#include "osdep_service.h"
#include "drv_types.h"
-#ifndef OID_802_11_CAPABILITY
- #define OID_802_11_CAPABILITY 0x0d010122
-#endif
-
-#ifndef OID_802_11_PMKID
- #define OID_802_11_PMKID 0x0d010123
-#endif
-
-/* For DDK-defined OIDs */
-#define OID_NDIS_SEG1 0x00010100
-#define OID_NDIS_SEG2 0x00010200
-#define OID_NDIS_SEG3 0x00020100
-#define OID_NDIS_SEG4 0x01010100
-#define OID_NDIS_SEG5 0x01020100
-#define OID_NDIS_SEG6 0x01020200
-#define OID_NDIS_SEG7 0xFD010100
-#define OID_NDIS_SEG8 0x0D010100
-#define OID_NDIS_SEG9 0x0D010200
-#define OID_NDIS_SEG10 0x0D020200
-
-#define SZ_OID_NDIS_SEG1 23
-#define SZ_OID_NDIS_SEG2 3
-#define SZ_OID_NDIS_SEG3 6
-#define SZ_OID_NDIS_SEG4 6
-#define SZ_OID_NDIS_SEG5 4
-#define SZ_OID_NDIS_SEG6 8
-#define SZ_OID_NDIS_SEG7 7
-#define SZ_OID_NDIS_SEG8 36
-#define SZ_OID_NDIS_SEG9 24
-#define SZ_OID_NDIS_SEG10 19
-
-/* For Realtek-defined OIDs */
-#define OID_MP_SEG1 0xFF871100
-#define OID_MP_SEG2 0xFF818000
-
-#define OID_MP_SEG3 0xFF818700
-#define OID_MP_SEG4 0xFF011100
-
-enum oid_type {
- QUERY_OID,
- SET_OID
-};
-
-struct oid_funs_node {
- unsigned int oid_start; /* the starting number for OID */
- unsigned int oid_end; /* the ending number for OID */
- struct oid_obj_priv *node_array;
- unsigned int array_sz; /* the size of node_array */
- int query_counter; /* count the number of query hits for this segment */
- int set_counter; /* count the number of set hits for this segment */
-};
-
-struct oid_par_priv {
- void *adapter_context;
- NDIS_OID oid;
- void *information_buf;
- u32 information_buf_len;
- u32 *bytes_rw;
- u32 *bytes_needed;
- enum oid_type type_of_oid;
- u32 dbg;
-};
-
-struct oid_obj_priv {
- unsigned char dbg; /* 0: without OID debug message
- * 1: with OID debug message */
- int (*oidfuns)(struct oid_par_priv *poid_par_priv);
-};
-
extern struct iw_handler_def rtw_handlers_def;
-
-int drv_query_info(struct net_device *miniportadaptercontext, NDIS_OID oid,
- void *informationbuffer, u32 informationbufferlength,
- u32 *byteswritten, u32 *bytesneeded);
-
-int drv_set_info(struct net_device *MiniportAdapterContext,
- NDIS_OID oid, void *informationbuffer,
- u32 informationbufferlength, u32 *bytesread,
- u32 *bytesneeded);
-
extern int ui_pid[3];
#endif /* #ifndef __INC_CEINFO_ */
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-04-07 19:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-07 19:28 [PATCH 0/8] staging: r8188eu: some simple cleanups Michael Straube
2022-04-07 19:28 ` [PATCH 1/8] staging: r8188eu: remove unused macros from basic_types.h Michael Straube
2022-04-07 19:28 ` [PATCH 2/8] staging: r8188eu: move struct rt_firmware to rtw_fw.h Michael Straube
2022-04-07 19:28 ` [PATCH 3/8] staging: r8188eu: ROMVer is always zero Michael Straube
2022-04-07 19:28 ` [PATCH 4/8] staging: r8188eu: remove unused fields from struct eeprom_priv Michael Straube
2022-04-07 19:28 ` [PATCH 5/8] staging: r8188eu: remove unused enums from odm.h Michael Straube
2022-04-07 19:28 ` [PATCH 6/8] staging: r8188eu: remove unused prototype usbvendorrequest() Michael Straube
2022-04-07 19:28 ` [PATCH 7/8] staging: r8188eu: remove header usb_vendor_req.h Michael Straube
2022-04-07 19:28 ` [PATCH 8/8] staging: r8188eu: clean up rtw_ioctl.h Michael Straube
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).