Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B15523FCD for ; Tue, 21 Sep 2021 18:19:03 +0000 (UTC) Received: by mail-ed1-f44.google.com with SMTP id r5so7747090edi.10 for ; Tue, 21 Sep 2021 11:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iS0yrz2R2AQfS41qiitv5hcqB1aEN904+JCIHfInJMc=; b=Ld5HhnuBjmawUaJClQ+o42Qk/gDny9CrzPMmV+WwDrkMPKiqYEsmd2aRlGjiz/92bv dNamLEo/BCD/ebGsVdVSt8LXF/cE+avSvd/98XlWlnHR3eZwxCsXJLcTM3sOWLffChAN dBkuj3Znxnp4u6Xl6xRYmaTT9aPKvhr/pyg/uy23Me6s34PDGVi02sd+uiyPDL/ljd5+ L+PuIKm4KCglHYVsoSn6LEHQ6ZMBOHrO0vsYv1zoeaJYgDnJa0XO09NLTU5j2E73R5lZ 4Cg2ChyIxr56KIx+UEe72aVhAZXeB3jTqWwF6ezPx1TlPzV/qPpQ2EduSw65/cx+2uV3 LbMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iS0yrz2R2AQfS41qiitv5hcqB1aEN904+JCIHfInJMc=; b=AftL5nzj62l8k08ziH7syljIZdz8Sx5wHkbNofIn2pKMvKSiNdZMMJ6sfXz2w+zJGP 2C5+ptOVHIbAEP+PNwNBRbaGnEdt9TrC7H+4SNk3RD/lgX+tDD2knN4TJ+2vHDaa+3Fh vm2ECLkuon7yUDfQSbWRsEVPoeIP/7PAi1gEVpBtH6AXL25cxbMbxkRCGcoG9S5LYAz/ ZcJOwze69POWR0XNtdE97o3aAqHssKNIyvX2fLNZtf3wQVl4WFg79/IBEl2QL+QWyf9V ndZB7E2iwI1/XBtScxgVl3bfoeOlCGMLk4PovfKdOQ4I7+Zxuemjq8l2eH5OFo7Oi1Qt Ejjw== X-Gm-Message-State: AOAM531NetlLpALPfaQFlUmoxHJzKeQCkq/TNn+WOr5dt4wxXUlH59EZ pDSIv0OfmampmtGAJadmMag= X-Google-Smtp-Source: ABdhPJy1F89X/n4iaEaAK0LMg+JbXXcaONPI01qXi/g0GuqhSxlmyr5evEguF1BGL7KU9r1yiqbwBA== X-Received: by 2002:aa7:d582:: with SMTP id r2mr37199868edq.324.1632248341397; Tue, 21 Sep 2021 11:19:01 -0700 (PDT) Received: from localhost.localdomain.it (host-212-171-30-160.retail.telecomitalia.it. [212.171.30.160]) by smtp.gmail.com with ESMTPSA id cn8sm1833162edb.77.2021.09.21.11.19.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:19:01 -0700 (PDT) From: "Fabio M. De Francesco" To: Larry Finger , Phillip Potter , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Dan Carpenter , Martin Kaiser Cc: "Fabio M. De Francesco" Subject: [PATCH v9 06/16] staging: r8188eu: rename symbols in rtw_read*() and rtw_write*() Date: Tue, 21 Sep 2021 20:18:24 +0200 Message-Id: <20210921181834.29677-7-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210921181834.29677-1-fmdefrancesco@gmail.com> References: <20210921181834.29677-1-fmdefrancesco@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rename names of variables in rtw_read{8.16.32}() and in rtw_write{8,16,32,N}() because of unnecessary 'p' (that probably stand for "pointer to") and 'w' (that probably stands for "word"): pio_priv => io_priv; pintfhdl => intf; wvalue => value. Co-developed-by: Pavel Skripkin Signed-off-by: Pavel Skripkin Signed-off-by: Fabio M. De Francesco --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 60 ++++++++++----------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 5c9613cc2415..9ff57e114b04 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -94,91 +94,91 @@ static int usbctrl_vendorreq(struct intf_hdl *intf, u16 value, void *data, u16 l u8 rtw_read8(struct adapter *adapter, u32 addr) { - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 wvalue = (u16)(addr & 0x0000ffff); + struct io_priv *io_priv = &adapter->iopriv; + struct intf_hdl *intf = &io_priv->intf; + u16 value = (u16)(addr & 0x0000ffff); u8 data; - usbctrl_vendorreq(pintfhdl, wvalue, &data, 1, REALTEK_USB_VENQT_READ); + usbctrl_vendorreq(intf, value, &data, 1, REALTEK_USB_VENQT_READ); return data; } u16 rtw_read16(struct adapter *adapter, u32 addr) { - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 wvalue = (u16)(addr & 0x0000ffff); + struct io_priv *io_priv = &adapter->iopriv; + struct intf_hdl *intf = &io_priv->intf; + u16 value = (u16)(addr & 0x0000ffff); __le32 data; - usbctrl_vendorreq(pintfhdl, wvalue, &data, 2, REALTEK_USB_VENQT_READ); + usbctrl_vendorreq(intf, value, &data, 2, REALTEK_USB_VENQT_READ); return (u16)(le32_to_cpu(data) & 0xffff); } u32 rtw_read32(struct adapter *adapter, u32 addr) { - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 wvalue = (u16)(addr & 0x0000ffff); + struct io_priv *io_priv = &adapter->iopriv; + struct intf_hdl *intf = &io_priv->intf; + u16 value = (u16)(addr & 0x0000ffff); __le32 data; - usbctrl_vendorreq(pintfhdl, wvalue, &data, 4, REALTEK_USB_VENQT_READ); + usbctrl_vendorreq(intf, value, &data, 4, REALTEK_USB_VENQT_READ); return le32_to_cpu(data); } int rtw_write8(struct adapter *adapter, u32 addr, u8 val) { - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 wvalue = (u16)(addr & 0x0000ffff); + struct io_priv *io_priv = &adapter->iopriv; + struct intf_hdl *intf = &io_priv->intf; + u16 value = (u16)(addr & 0x0000ffff); int ret; - ret = usbctrl_vendorreq(pintfhdl, wvalue, &val, 1, REALTEK_USB_VENQT_WRITE); + ret = usbctrl_vendorreq(intf, value, &val, 1, REALTEK_USB_VENQT_WRITE); return RTW_STATUS_CODE(ret); } int rtw_write16(struct adapter *adapter, u32 addr, u16 val) { - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 wvalue = (u16)(addr & 0x0000ffff); + struct io_priv *io_priv = &adapter->iopriv; + struct intf_hdl *intf = &io_priv->intf; + u16 value = (u16)(addr & 0x0000ffff); __le32 data = cpu_to_le32(val & 0x0000ffff); int ret; - ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, 2, REALTEK_USB_VENQT_WRITE); + ret = usbctrl_vendorreq(intf, value, &data, 2, REALTEK_USB_VENQT_WRITE); return RTW_STATUS_CODE(ret); } int rtw_write32(struct adapter *adapter, u32 addr, u32 val) { - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 wvalue = (u16)(addr & 0x0000ffff); + struct io_priv *io_priv = &adapter->iopriv; + struct intf_hdl *intf = &io_priv->intf; + u16 value = (u16)(addr & 0x0000ffff); __le32 data = cpu_to_le32(val); int ret; - ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, 4, REALTEK_USB_VENQT_WRITE); + ret = usbctrl_vendorreq(intf, value, &data, 4, REALTEK_USB_VENQT_WRITE); return RTW_STATUS_CODE(ret); } -int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata) +int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data) { - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 wvalue = (u16)(addr & 0x0000ffff); + struct io_priv *io_priv = &adapter->iopriv; + struct intf_hdl *intf = &io_priv->intf; + u16 value = (u16)(addr & 0x0000ffff); u8 buf[VENDOR_CMD_MAX_DATA_LEN] = {0}; int ret; if (length > VENDOR_CMD_MAX_DATA_LEN) return _FAIL; - memcpy(buf, pdata, length); - ret = usbctrl_vendorreq(pintfhdl, wvalue, buf, (length & 0xffff), REALTEK_USB_VENQT_WRITE); + memcpy(buf, data, length); + ret = usbctrl_vendorreq(intf, value, buf, (length & 0xffff), REALTEK_USB_VENQT_WRITE); return RTW_STATUS_CODE(ret); } -- 2.33.0