github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: r8188eu: pass struct adapter to usb_read

Browse Source 
The usb_read function takes a struct intf_hdl only to extract the struct
adapter from it. We can pass struct adapter directly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230111195640.306748-18-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2023-01-11 20:56:37 +01:00 committed by Greg Kroah-Hartman
parent 3f7d87d4ec
commit 0d4560530d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/r8188eu/hal/usb_ops_linux.c
View File

@ -7,9 +7,8 @@
#include "../include/usb_ops.h"
#include "../include/rtl8188e_hal.h"
static int usb_read(struct intf_hdl *intf, u16 value, void *data, u8 size)
static int usb_read(struct adapter *adapt, u16 value, void *data, u8 size)
{
struct adapter *adapt = intf->padapter;
struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt);
struct usb_device *udev = dvobjpriv->pusbdev;
int status;
@ -95,20 +94,18 @@ static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size)
int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data)
{
struct intf_hdl *intf = &adapter->intf;
u16 value = addr & 0xffff;
return usb_read(intf, value, data, 1);
return usb_read(adapter, value, data, 1);
}
int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data)
{
struct intf_hdl *intf = &adapter->intf;
u16 value = addr & 0xffff;
__le16 le_data;
int res;
res = usb_read(intf, value, &le_data, 2);
res = usb_read(adapter, value, &le_data, 2);
if (res)
return res;
@ -119,12 +116,11 @@ int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data)
int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data)
{
struct intf_hdl *intf = &adapter->intf;
u16 value = addr & 0xffff;
__le32 le_data;
int res;
res = usb_read(intf, value, &le_data, 4);
res = usb_read(adapter, value, &le_data, 4);
if (res)
return res;