From: Martin Kaiser Date: Sat, 21 Aug 2021 16:48:55 +0000 (+0200) Subject: staging: r8188eu: clean up the usb_readXY functions X-Git-Tag: accepted/tizen/unified/20230118.172025~6524^2~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d3e1be506dda7a0a3d43fad4d943cfbfabadd39;p=platform%2Fkernel%2Flinux-rpi.git staging: r8188eu: clean up the usb_readXY functions Remove unnecessary variables, summarize declarations and assignments. Acked-by: Phillip Potter Acked-by: Michael Straube Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20210821164859.4351-6-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index dccb9fd..cb969a2 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); }