staging: r8188eu: clean up the usb_writeXY 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-7-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index cb969a200681777ea66ba224c8c67387956a7705..e01f1ac19596e8dd507c04d35e8c8810839730ba 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -128,59 +128,25 @@ static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
 
 static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)
 {
-       u16 wvalue;
-       u16 len;
-       u8 data;
-       int ret;
-
-
-       wvalue = (u16)(addr & 0x0000ffff);
-       len = 1;
-       data = val;
-       ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
+       u16 wvalue = (u16)(addr & 0x0000ffff);
 
-       return ret;
+       return usbctrl_vendorreq(pintfhdl, wvalue, &val, 1, REALTEK_USB_VENQT_WRITE);
 }
 
 static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
 {
-       u16 wvalue;
-       u16 len;
-       __le32 data;
-       int ret;
-
-
-
-       wvalue = (u16)(addr & 0x0000ffff);
-       len = 2;
-
-       data = cpu_to_le32(val & 0x0000ffff);
-
-       ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
-
-
+       u16 wvalue = (u16)(addr & 0x0000ffff);
+       __le32 data = cpu_to_le32(val & 0x0000ffff);
 
-       return ret;
+       return usbctrl_vendorreq(pintfhdl, wvalue, &data, 2, REALTEK_USB_VENQT_WRITE);
 }
 
 static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
 {
-       u16 wvalue;
-       u16 len;
-       __le32 data;
-       int ret;
-
-
-
-       wvalue = (u16)(addr & 0x0000ffff);
-       len = 4;
-       data = cpu_to_le32(val);
-
-       ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
-
-
+       u16 wvalue = (u16)(addr & 0x0000ffff);
+       __le32 data = cpu_to_le32(val);
 
-       return ret;
+       return usbctrl_vendorreq(pintfhdl, wvalue, &data, 4, REALTEK_USB_VENQT_WRITE);
 }
 
 static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata)