* [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components
@ 2021-04-06 20:48 Martin Kaiser
2021-04-06 20:48 ` [PATCH 02/11] staging: rtl8188eu: ctrl vendor req value is always 0x05 Martin Kaiser
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
struct hal_data_8188e contains some components related to efuses which
are not used for rtl8188eu.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
.../staging/rtl8188eu/include/rtl8188e_hal.h | 4 ----
drivers/staging/rtl8188eu/include/rtw_efuse.h | 20 -------------------
2 files changed, 24 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index 6035c12ec578..0c4c23be1dd5 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -211,10 +211,6 @@ struct hal_data_8188e {
u8 bAPKThermalMeterIgnore;
bool EepromOrEfuse;
- /* 92C:256bytes, 88E:512bytes, we use union set (512bytes) */
- u8 EfuseMap[2][HWSET_MAX_SIZE_512];
- u8 EfuseUsedPercentage;
- struct efuse_hal EfuseHal;
u8 Index24G_CCK_Base[MAX_RF_PATH][CHANNEL_MAX_NUMBER];
u8 Index24G_BW40_Base[MAX_RF_PATH][CHANNEL_MAX_NUMBER];
diff --git a/drivers/staging/rtl8188eu/include/rtw_efuse.h b/drivers/staging/rtl8188eu/include/rtw_efuse.h
index 5926fc9b5e6b..74182c32c4ec 100644
--- a/drivers/staging/rtl8188eu/include/rtw_efuse.h
+++ b/drivers/staging/rtl8188eu/include/rtw_efuse.h
@@ -56,26 +56,6 @@ struct pgpkt {
u8 word_cnts;
};
-/*------------------------------Define structure----------------------------*/
-struct efuse_hal {
- u8 fakeEfuseBank;
- u32 fakeEfuseUsedBytes;
- u8 fakeEfuseContent[EFUSE_MAX_HW_SIZE];
- u8 fakeEfuseInitMap[EFUSE_MAX_MAP_LEN];
- u8 fakeEfuseModifiedMap[EFUSE_MAX_MAP_LEN];
-
- u16 BTEfuseUsedBytes;
- u8 BTEfuseUsedPercentage;
- u8 BTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE];
- u8 BTEfuseInitMap[EFUSE_BT_MAX_MAP_LEN];
- u8 BTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN];
-
- u16 fakeBTEfuseUsedBytes;
- u8 fakeBTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE];
- u8 fakeBTEfuseInitMap[EFUSE_BT_MAX_MAP_LEN];
- u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN];
-};
-
u8 Efuse_CalculateWordCnts(u8 word_en);
u8 efuse_OneByteRead(struct adapter *adapter, u16 addr, u8 *data);
u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data);
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 02/11] staging: rtl8188eu: ctrl vendor req value is always 0x05
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 03/11] staging: rtl8188eu: ctrl vendor req index is not used Martin Kaiser
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
The bRequest value for the vendor specific control requests sent by this
driver is always 0x05. Replace the function parameter with a define. Use
the same define as the rtlwifi driver.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
.../staging/rtl8188eu/os_dep/usb_ops_linux.c | 32 +++++++------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 6926443bba4e..bf57a91cc40d 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -10,6 +10,8 @@
#include <recv_osdep.h>
#include <rtw_sreset.h>
+#define REALTEK_USB_VENQT_CMD_REQ 0x05
+
static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbuf)
{
struct hal_data_8188e *haldata = adapt->HalData;
@@ -198,7 +200,8 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)
return pipe;
}
-static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 index, void *pdata, u16 len, u8 requesttype)
+static int
+usbctrl_vendorreq(struct adapter *adapt, u16 value, u16 index, void *pdata, u16 len, u8 requesttype)
{
struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt);
struct usb_device *udev = dvobjpriv->pusbdev;
@@ -247,7 +250,8 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i
memcpy(pIo_buf, pdata, len);
}
- status = usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
+ status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
+ reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
if (status == len) { /* Success this control transfer. */
if (requesttype == 0x01)
@@ -286,61 +290,55 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i
u8 usb_read8(struct adapter *adapter, u32 addr)
{
- u8 request;
u8 requesttype;
u16 wvalue;
u16 index;
u16 len;
u8 data = 0;
- request = 0x05;
requesttype = 0x01;/* read_in */
index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
- usbctrl_vendorreq(adapter, request, wvalue, index, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, index, &data, len, requesttype);
return data;
}
u16 usb_read16(struct adapter *adapter, u32 addr)
{
- u8 request;
u8 requesttype;
u16 wvalue;
u16 index;
u16 len;
__le32 data;
- request = 0x05;
requesttype = 0x01;/* read_in */
index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 2;
- usbctrl_vendorreq(adapter, request, wvalue, index, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, index, &data, len, requesttype);
return (u16)(le32_to_cpu(data) & 0xffff);
}
u32 usb_read32(struct adapter *adapter, u32 addr)
{
- u8 request;
u8 requesttype;
u16 wvalue;
u16 index;
u16 len;
__le32 data;
- request = 0x05;
requesttype = 0x01;/* read_in */
index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 4;
- usbctrl_vendorreq(adapter, request, wvalue, index, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, index, &data, len, requesttype);
return le32_to_cpu(data);
}
@@ -508,33 +506,29 @@ void rtw_hal_inirp_deinit(struct adapter *padapter)
int usb_write8(struct adapter *adapter, u32 addr, u8 val)
{
- u8 request;
u8 requesttype;
u16 wvalue;
u16 index;
u16 len;
u8 data;
- request = 0x05;
requesttype = 0x00;/* write_out */
index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
data = val;
- return usbctrl_vendorreq(adapter, request, wvalue,
+ return usbctrl_vendorreq(adapter, wvalue,
index, &data, len, requesttype);
}
int usb_write16(struct adapter *adapter, u32 addr, u16 val)
{
- u8 request;
u8 requesttype;
u16 wvalue;
u16 index;
u16 len;
__le32 data;
- request = 0x05;
requesttype = 0x00;/* write_out */
index = 0;/* n/a */
@@ -543,20 +537,18 @@ int usb_write16(struct adapter *adapter, u32 addr, u16 val)
data = cpu_to_le32(val & 0x0000ffff);
- return usbctrl_vendorreq(adapter, request, wvalue,
+ return usbctrl_vendorreq(adapter, wvalue,
index, &data, len, requesttype);
}
int usb_write32(struct adapter *adapter, u32 addr, u32 val)
{
- u8 request;
u8 requesttype;
u16 wvalue;
u16 index;
u16 len;
__le32 data;
- request = 0x05;
requesttype = 0x00;/* write_out */
index = 0;/* n/a */
@@ -564,7 +556,7 @@ int usb_write32(struct adapter *adapter, u32 addr, u32 val)
len = 4;
data = cpu_to_le32(val);
- return usbctrl_vendorreq(adapter, request, wvalue,
+ return usbctrl_vendorreq(adapter, wvalue,
index, &data, len, requesttype);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 03/11] staging: rtl8188eu: ctrl vendor req index is not used
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
2021-04-06 20:48 ` [PATCH 02/11] staging: rtl8188eu: ctrl vendor req value is always 0x05 Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 04/11] staging: rtl8188eu: use actual request type as parameter Martin Kaiser
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
The index for rtl8188eu's vendor-specific control requests is not used.
Remove the index parameter from usbctrl_vendorreq and pass index 0 to
usb_control_msg.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
.../staging/rtl8188eu/os_dep/usb_ops_linux.c | 33 ++++++-------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index bf57a91cc40d..b760636f03d3 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -11,6 +11,7 @@
#include <rtw_sreset.h>
#define REALTEK_USB_VENQT_CMD_REQ 0x05
+#define REALTEK_USB_VENQT_CMD_IDX 0x00
static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbuf)
{
@@ -201,7 +202,7 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)
}
static int
-usbctrl_vendorreq(struct adapter *adapt, u16 value, u16 index, void *pdata, u16 len, u8 requesttype)
+usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 requesttype)
{
struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt);
struct usb_device *udev = dvobjpriv->pusbdev;
@@ -251,7 +252,8 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, u16 index, void *pdata, u16
}
status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
- reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
+ reqtype, value, REALTEK_USB_VENQT_CMD_IDX,
+ pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
if (status == len) { /* Success this control transfer. */
if (requesttype == 0x01)
@@ -292,17 +294,15 @@ u8 usb_read8(struct adapter *adapter, u32 addr)
{
u8 requesttype;
u16 wvalue;
- u16 index;
u16 len;
u8 data = 0;
requesttype = 0x01;/* read_in */
- index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
- usbctrl_vendorreq(adapter, wvalue, index, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
return data;
}
@@ -311,15 +311,13 @@ u16 usb_read16(struct adapter *adapter, u32 addr)
{
u8 requesttype;
u16 wvalue;
- u16 index;
u16 len;
__le32 data;
requesttype = 0x01;/* read_in */
- index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 2;
- usbctrl_vendorreq(adapter, wvalue, index, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
return (u16)(le32_to_cpu(data) & 0xffff);
}
@@ -328,17 +326,15 @@ u32 usb_read32(struct adapter *adapter, u32 addr)
{
u8 requesttype;
u16 wvalue;
- u16 index;
u16 len;
__le32 data;
requesttype = 0x01;/* read_in */
- index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 4;
- usbctrl_vendorreq(adapter, wvalue, index, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
return le32_to_cpu(data);
}
@@ -508,56 +504,47 @@ int usb_write8(struct adapter *adapter, u32 addr, u8 val)
{
u8 requesttype;
u16 wvalue;
- u16 index;
u16 len;
u8 data;
requesttype = 0x00;/* write_out */
- index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
data = val;
- return usbctrl_vendorreq(adapter, wvalue,
- index, &data, len, requesttype);
+ return usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
}
int usb_write16(struct adapter *adapter, u32 addr, u16 val)
{
u8 requesttype;
u16 wvalue;
- u16 index;
u16 len;
__le32 data;
requesttype = 0x00;/* write_out */
- index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 2;
data = cpu_to_le32(val & 0x0000ffff);
- return usbctrl_vendorreq(adapter, wvalue,
- index, &data, len, requesttype);
+ return usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
}
int usb_write32(struct adapter *adapter, u32 addr, u32 val)
{
u8 requesttype;
u16 wvalue;
- u16 index;
u16 len;
__le32 data;
requesttype = 0x00;/* write_out */
- index = 0;/* n/a */
wvalue = (u16)(addr & 0x0000ffff);
len = 4;
data = cpu_to_le32(val);
- return usbctrl_vendorreq(adapter, wvalue,
- index, &data, len, requesttype);
+ return usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
}
static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 04/11] staging: rtl8188eu: use actual request type as parameter
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
2021-04-06 20:48 ` [PATCH 02/11] staging: rtl8188eu: ctrl vendor req value is always 0x05 Martin Kaiser
2021-04-06 20:48 ` [PATCH 03/11] staging: rtl8188eu: ctrl vendor req index is not used Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 05/11] staging: rtl8188eu: clean up usb_read8 Martin Kaiser
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
At the moment, usbctrl_vendorreq's requesttype parameter must be set to 1
for reading and 0 for writing. It's then converted to the actual
bmRequestType for the USB control request. We can simplify the code and
avoid this conversion if the caller passes the actual bmRequestType.
We already have defines for the read and write request types. Move them to
usb_ops_linux.c, they're used only inside this file. Replace the numeric
values with USB constants to make their meaning clearer.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
.../staging/rtl8188eu/include/usb_ops_linux.h | 3 --
.../staging/rtl8188eu/os_dep/usb_ops_linux.c | 52 +++++++------------
2 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/usb_ops_linux.h b/drivers/staging/rtl8188eu/include/usb_ops_linux.h
index 70d729742839..4e0e48cb5c8e 100644
--- a/drivers/staging/rtl8188eu/include/usb_ops_linux.h
+++ b/drivers/staging/rtl8188eu/include/usb_ops_linux.h
@@ -16,9 +16,6 @@
#define RTW_USB_BULKOUT_TIME 5000/* ms */
-#define REALTEK_USB_VENQT_READ 0xC0
-#define REALTEK_USB_VENQT_WRITE 0x40
-
#define ALIGNMENT_UNIT 16
#define MAX_VENDOR_REQ_CMD_SIZE 254 /* 8188cu SIE Support */
#define MAX_USB_IO_CTL_SIZE (MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index b760636f03d3..205a15dd67a5 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -10,6 +10,9 @@
#include <recv_osdep.h>
#include <rtw_sreset.h>
+#define REALTEK_USB_VENQT_READ (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
+#define REALTEK_USB_VENQT_WRITE (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
+
#define REALTEK_USB_VENQT_CMD_REQ 0x05
#define REALTEK_USB_VENQT_CMD_IDX 0x00
@@ -202,13 +205,12 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)
}
static int
-usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 requesttype)
+usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 reqtype)
{
struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt);
struct usb_device *udev = dvobjpriv->pusbdev;
unsigned int pipe;
int status = 0;
- u8 reqtype;
u8 *pIo_buf;
int vendorreq_times = 0;
@@ -242,13 +244,14 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 req
while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
memset(pIo_buf, 0, len);
- if (requesttype == 0x01) {
+ if (reqtype == REALTEK_USB_VENQT_READ) {
pipe = usb_rcvctrlpipe(udev, 0);/* read_in */
- reqtype = REALTEK_USB_VENQT_READ;
- } else {
+ } else if (reqtype == REALTEK_USB_VENQT_WRITE) {
pipe = usb_sndctrlpipe(udev, 0);/* write_out */
- reqtype = REALTEK_USB_VENQT_WRITE;
memcpy(pIo_buf, pdata, len);
+ } else {
+ status = -EINVAL;
+ goto free_buf;
}
status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
@@ -256,11 +259,11 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 req
pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
if (status == len) { /* Success this control transfer. */
- if (requesttype == 0x01)
+ if (reqtype == REALTEK_USB_VENQT_READ)
memcpy(pdata, pIo_buf, len);
} else { /* error cases */
DBG_88E("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n",
- value, (requesttype == 0x01) ? "read" : "write",
+ value, (reqtype == REALTEK_USB_VENQT_READ) ? "read" : "write",
len, status, *(u32 *)pdata, vendorreq_times);
if (status < 0) {
@@ -270,7 +273,7 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 req
adapt->HalData->srestpriv.wifi_error_status = USB_VEN_REQ_CMD_FAIL;
} else { /* status != len && status >= 0 */
if (status > 0) {
- if (requesttype == 0x01) {
+ if (reqtype == REALTEK_USB_VENQT_READ) {
/* For Control read transfer, we have to copy the read data from pIo_buf to pdata. */
memcpy(pdata, pIo_buf, len);
}
@@ -282,8 +285,9 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 req
if ((value >= FW_8188E_START_ADDRESS && value <= FW_8188E_END_ADDRESS) || status == len)
break;
}
- kfree(pIo_buf);
+free_buf:
+ kfree(pIo_buf);
release_mutex:
mutex_unlock(&dvobjpriv->usb_vendor_req_mutex);
exit:
@@ -292,49 +296,41 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 req
u8 usb_read8(struct adapter *adapter, u32 addr)
{
- u8 requesttype;
u16 wvalue;
u16 len;
u8 data = 0;
- requesttype = 0x01;/* read_in */
-
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
- usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_READ);
return data;
}
u16 usb_read16(struct adapter *adapter, u32 addr)
{
- u8 requesttype;
u16 wvalue;
u16 len;
__le32 data;
- requesttype = 0x01;/* read_in */
wvalue = (u16)(addr & 0x0000ffff);
len = 2;
- usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_READ);
return (u16)(le32_to_cpu(data) & 0xffff);
}
u32 usb_read32(struct adapter *adapter, u32 addr)
{
- u8 requesttype;
u16 wvalue;
u16 len;
__le32 data;
- requesttype = 0x01;/* read_in */
-
wvalue = (u16)(addr & 0x0000ffff);
len = 4;
- usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
+ usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_READ);
return le32_to_cpu(data);
}
@@ -502,49 +498,41 @@ void rtw_hal_inirp_deinit(struct adapter *padapter)
int usb_write8(struct adapter *adapter, u32 addr, u8 val)
{
- u8 requesttype;
u16 wvalue;
u16 len;
u8 data;
- requesttype = 0x00;/* write_out */
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
data = val;
- return usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
+ return usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
}
int usb_write16(struct adapter *adapter, u32 addr, u16 val)
{
- u8 requesttype;
u16 wvalue;
u16 len;
__le32 data;
- requesttype = 0x00;/* write_out */
-
wvalue = (u16)(addr & 0x0000ffff);
len = 2;
data = cpu_to_le32(val & 0x0000ffff);
- return usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
+ return usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
}
int usb_write32(struct adapter *adapter, u32 addr, u32 val)
{
- u8 requesttype;
u16 wvalue;
u16 len;
__le32 data;
- requesttype = 0x00;/* write_out */
-
wvalue = (u16)(addr & 0x0000ffff);
len = 4;
data = cpu_to_le32(val);
- return usbctrl_vendorreq(adapter, wvalue, &data, len, requesttype);
+ return usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
}
static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 05/11] staging: rtl8188eu: clean up usb_read8
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
` (2 preceding siblings ...)
2021-04-06 20:48 ` [PATCH 04/11] staging: rtl8188eu: use actual request type as parameter Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 06/11] staging: rtl8188eu: clean up usb_read16 Martin Kaiser
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
Remove unnecessary variable, summarize declaration and assignment.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 205a15dd67a5..0172405c815e 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -296,14 +296,10 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 req
u8 usb_read8(struct adapter *adapter, u32 addr)
{
- u16 wvalue;
- u16 len;
- u8 data = 0;
-
- wvalue = (u16)(addr & 0x0000ffff);
- len = 1;
+ u16 wvalue = (u16)(addr & 0xffff);
+ u8 data;
- usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_READ);
+ usbctrl_vendorreq(adapter, wvalue, &data, 1, REALTEK_USB_VENQT_READ);
return data;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 06/11] staging: rtl8188eu: clean up usb_read16
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
` (3 preceding siblings ...)
2021-04-06 20:48 ` [PATCH 05/11] staging: rtl8188eu: clean up usb_read8 Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 07/11] staging: rtl8188eu: clean up usb_read32 Martin Kaiser
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
Remove unnecessary variable, summarize declaration and assignment.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 0172405c815e..915bf86237b0 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -306,13 +306,10 @@ u8 usb_read8(struct adapter *adapter, u32 addr)
u16 usb_read16(struct adapter *adapter, u32 addr)
{
- u16 wvalue;
- u16 len;
+ u16 wvalue = (u16)(addr & 0xffff);
__le32 data;
- wvalue = (u16)(addr & 0x0000ffff);
- len = 2;
- usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_READ);
+ usbctrl_vendorreq(adapter, wvalue, &data, 2, REALTEK_USB_VENQT_READ);
return (u16)(le32_to_cpu(data) & 0xffff);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 07/11] staging: rtl8188eu: clean up usb_read32
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
` (4 preceding siblings ...)
2021-04-06 20:48 ` [PATCH 06/11] staging: rtl8188eu: clean up usb_read16 Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 08/11] staging: rtl8188eu: clean up usb_write8 Martin Kaiser
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
Remove unnecessary variable, summarize declaration and assignment.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 915bf86237b0..beab5343fda8 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -316,14 +316,10 @@ u16 usb_read16(struct adapter *adapter, u32 addr)
u32 usb_read32(struct adapter *adapter, u32 addr)
{
- u16 wvalue;
- u16 len;
+ u16 wvalue = (u16)(addr & 0xffff);
__le32 data;
- wvalue = (u16)(addr & 0x0000ffff);
- len = 4;
-
- usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_READ);
+ usbctrl_vendorreq(adapter, wvalue, &data, 4, REALTEK_USB_VENQT_READ);
return le32_to_cpu(data);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 08/11] staging: rtl8188eu: clean up usb_write8
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
` (5 preceding siblings ...)
2021-04-06 20:48 ` [PATCH 07/11] staging: rtl8188eu: clean up usb_read32 Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 09/11] staging: rtl8188eu: clean up usb_write16 Martin Kaiser
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
Remove unnecessary variable, summarize declaration and assignment.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index beab5343fda8..e2ff4f70610e 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -487,14 +487,10 @@ void rtw_hal_inirp_deinit(struct adapter *padapter)
int usb_write8(struct adapter *adapter, u32 addr, u8 val)
{
- u16 wvalue;
- u16 len;
- u8 data;
+ u16 wvalue = (u16)(addr & 0xffff);
+ u8 data = val;
- wvalue = (u16)(addr & 0x0000ffff);
- len = 1;
- data = val;
- return usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
+ return usbctrl_vendorreq(adapter, wvalue, &data, 1, REALTEK_USB_VENQT_WRITE);
}
int usb_write16(struct adapter *adapter, u32 addr, u16 val)
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 09/11] staging: rtl8188eu: clean up usb_write16
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
` (6 preceding siblings ...)
2021-04-06 20:48 ` [PATCH 08/11] staging: rtl8188eu: clean up usb_write8 Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 10/11] staging: rtl8188eu: clean up usb_write32 Martin Kaiser
2021-04-06 20:48 ` [PATCH 11/11] staging: rtl8188eu: remove an obsolete comment Martin Kaiser
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
Remove unnecessary variable, summarize declaration and assignment.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index e2ff4f70610e..9d0c34f6a86c 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -495,16 +495,10 @@ int usb_write8(struct adapter *adapter, u32 addr, u8 val)
int usb_write16(struct adapter *adapter, u32 addr, u16 val)
{
- u16 wvalue;
- u16 len;
- __le32 data;
-
- wvalue = (u16)(addr & 0x0000ffff);
- len = 2;
-
- data = cpu_to_le32(val & 0x0000ffff);
+ u16 wvalue = (u16)(addr & 0xffff);
+ __le32 data = cpu_to_le32(val & 0xffff);
- return usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
+ return usbctrl_vendorreq(adapter, wvalue, &data, 2, REALTEK_USB_VENQT_WRITE);
}
int usb_write32(struct adapter *adapter, u32 addr, u32 val)
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 10/11] staging: rtl8188eu: clean up usb_write32
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
` (7 preceding siblings ...)
2021-04-06 20:48 ` [PATCH 09/11] staging: rtl8188eu: clean up usb_write16 Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
2021-04-06 20:48 ` [PATCH 11/11] staging: rtl8188eu: remove an obsolete comment Martin Kaiser
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
Remove unnecessary variable, summarize declaration and assignment.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 9d0c34f6a86c..bb5889a130ca 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -503,15 +503,10 @@ int usb_write16(struct adapter *adapter, u32 addr, u16 val)
int usb_write32(struct adapter *adapter, u32 addr, u32 val)
{
- u16 wvalue;
- u16 len;
- __le32 data;
-
- wvalue = (u16)(addr & 0x0000ffff);
- len = 4;
- data = cpu_to_le32(val);
+ u16 wvalue = (u16)(addr & 0xffff);
+ __le32 data = cpu_to_le32(val);
- return usbctrl_vendorreq(adapter, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
+ return usbctrl_vendorreq(adapter, wvalue, &data, 4, REALTEK_USB_VENQT_WRITE);
}
static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 11/11] staging: rtl8188eu: remove an obsolete comment
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
` (8 preceding siblings ...)
2021-04-06 20:48 ` [PATCH 10/11] staging: rtl8188eu: clean up usb_write32 Martin Kaiser
@ 2021-04-06 20:48 ` Martin Kaiser
9 siblings, 0 replies; 11+ messages in thread
From: Martin Kaiser @ 2021-04-06 20:48 UTC (permalink / raw)
To: Larry Finger, Greg Kroah-Hartman
Cc: linux-staging, kernel-janitors, linux-kernel, Martin Kaiser
This driver does not set URB_ZERO_PACKET.
The rtl8188eu driver that's available from Realtek/Edimax has some
commented-out code that sets zero packet. It was removed from this
driver before it was imported.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index bb5889a130ca..8e9fd9d4afda 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -677,8 +677,6 @@ u32 usb_write_port(struct adapter *padapter, u32 addr, u32 cnt, struct xmit_buf
ret = _SUCCESS;
-/* We add the URB_ZERO_PACKET flag to urb so that the host will send the zero packet automatically. */
-
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("-%s\n", __func__));
exit:
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-04-06 20:49 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-06 20:48 [PATCH 01/11] staging: rtl8188eu: remove unused efuse hal components Martin Kaiser
2021-04-06 20:48 ` [PATCH 02/11] staging: rtl8188eu: ctrl vendor req value is always 0x05 Martin Kaiser
2021-04-06 20:48 ` [PATCH 03/11] staging: rtl8188eu: ctrl vendor req index is not used Martin Kaiser
2021-04-06 20:48 ` [PATCH 04/11] staging: rtl8188eu: use actual request type as parameter Martin Kaiser
2021-04-06 20:48 ` [PATCH 05/11] staging: rtl8188eu: clean up usb_read8 Martin Kaiser
2021-04-06 20:48 ` [PATCH 06/11] staging: rtl8188eu: clean up usb_read16 Martin Kaiser
2021-04-06 20:48 ` [PATCH 07/11] staging: rtl8188eu: clean up usb_read32 Martin Kaiser
2021-04-06 20:48 ` [PATCH 08/11] staging: rtl8188eu: clean up usb_write8 Martin Kaiser
2021-04-06 20:48 ` [PATCH 09/11] staging: rtl8188eu: clean up usb_write16 Martin Kaiser
2021-04-06 20:48 ` [PATCH 10/11] staging: rtl8188eu: clean up usb_write32 Martin Kaiser
2021-04-06 20:48 ` [PATCH 11/11] staging: rtl8188eu: remove an obsolete comment Martin Kaiser
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).