diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2021-08-21 18:48:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-26 12:17:01 +0200 |
| commit | e8baed3c765e0f88f4107c52a3505f52d174b41f (patch) | |
| tree | 71b11698407ce118029654e9b1cae635dcefebe8 /drivers/staging/r8188eu | |
| parent | 0d3e1be506dda7a0a3d43fad4d943cfbfabadd39 (diff) | |
| download | linux-e8baed3c765e0f88f4107c52a3505f52d174b41f.tar.bz2 | |
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>
Diffstat (limited to 'drivers/staging/r8188eu')
| -rw-r--r-- | drivers/staging/r8188eu/hal/usb_ops_linux.c | 50 |
1 files changed, 8 insertions, 42 deletions
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index cb969a200681..e01f1ac19596 100644 --- 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) |