summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorMartin Kaiser <martin@kaiser.cx>2021-08-21 19:48:55 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-08-26 13:17:00 +0300
commit0d3e1be506dda7a0a3d43fad4d943cfbfabadd39 (patch)
treeec94a1f1e68a3721dc8a26ab5af1c5ffeaf74df1 /drivers/staging
parent2214ea8299f5dcf1201521ab527b750ec53fbba8 (diff)
downloadlinux-0d3e1be506dda7a0a3d43fad4d943cfbfabadd39.tar.xz
staging: r8188eu: clean up the usb_readXY functions
Remove unnecessary variables, summarize declarations and assignments. Acked-by: Phillip Potter <phil@philpotter.co.uk> Acked-by: Michael Straube <straube.linux@gmail.com> Signed-off-by: Martin Kaiser <martin@kaiser.cx> Link: https://lore.kernel.org/r/20210821164859.4351-6-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/r8188eu/hal/usb_ops_linux.c30
1 files changed, 7 insertions, 23 deletions
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index dccb9fd34777..cb969a200681 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -98,46 +98,30 @@ exit:
static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
{
- u16 wvalue;
- u16 len;
- u8 data = 0;
-
-
-
- wvalue = (u16)(addr & 0x0000ffff);
- len = 1;
-
- usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_READ);
-
+ u16 wvalue = (u16)(addr & 0x0000ffff);
+ u8 data;
+ usbctrl_vendorreq(pintfhdl, wvalue, &data, 1, REALTEK_USB_VENQT_READ);
return data;
-
}
static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)
{
- u16 wvalue;
- u16 len;
+ u16 wvalue = (u16)(addr & 0x0000ffff);
__le32 data;
- wvalue = (u16)(addr & 0x0000ffff);
- len = 2;
- usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_READ);
+ usbctrl_vendorreq(pintfhdl, wvalue, &data, 2, REALTEK_USB_VENQT_READ);
return (u16)(le32_to_cpu(data) & 0xffff);
}
static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
{
- u16 wvalue;
- u16 len;
+ u16 wvalue = (u16)(addr & 0x0000ffff);
__le32 data;
- wvalue = (u16)(addr & 0x0000ffff);
- len = 4;
-
- usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_READ);
+ usbctrl_vendorreq(pintfhdl, wvalue, &data, 4, REALTEK_USB_VENQT_READ);
return le32_to_cpu(data);
}