lkml.org 
[lkml]   [2021]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 06/10] staging: r8188eu: clean up the usb_readXY functions
On Sat, 21 Aug 2021 at 17:49, Martin Kaiser <martin@kaiser.cx> wrote:
>
> Remove unnecessary variables, summarize declarations and assignments.
>
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> drivers/staging/r8188eu/hal/usb_ops_linux.c | 30 +++++----------------
> 1 file 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 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
>
> 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);
> }
> --
> 2.20.1
>

Acked-by: Phillip Potter <phil@philpotter.co.uk>

Regards,
Phil

\
 
 \ /
  Last update: 2021-08-21 19:46    [W:0.114 / U:2.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site