From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 4DFD32FAF for ; Mon, 13 Sep 2021 18:10:37 +0000 (UTC) Received: by mail-ed1-f46.google.com with SMTP id v5so15689113edc.2 for ; Mon, 13 Sep 2021 11:10:37 -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=R5wCXN8UMr0yeIliFqF4PlBTRBgABhGfIl5Cz/aUsug=; b=d1OcZ4AF4PYa4o+xzHZQQFqfZ10aqMcc0p6kjqxBkYuVWnM+rXSEECBnGpxOU+j+Ad VJbg8mIuAw78iDINmdvI+Y3PxzO778el2xsvDxaankxoTt65/1nD1gZnqp4ODYMMYUG8 hjFjUaApv94RtS4CRacGWZ/hnk9maceFb9rtoEawKI6N9cm16RQtq20ij+h+7Zc1V676 9hnsKc66k87vorTG+9SJTJY8pxGw0/NiIIp6maLpeH7ZVlThJ0rB6SX1K8k1djceK8+B XKzNzrhyggFlHTDPlpQwjcPM6ZiFprFTBQuENn/4l+qvmyy4cJLTymx8WojfesAbj5bm Nj6A== 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=R5wCXN8UMr0yeIliFqF4PlBTRBgABhGfIl5Cz/aUsug=; b=uol36qkqYP7KBm/JqN4/lMEe42nciQ4iwCR7rQNJINmtHoYTmQvQDdRBLvpFuuqL+I 4JFghI520L4jSpYwX8HbwHELdcA+nmTb7dmDpqC50Pqu9K8eaKRmaZQbtmpNAl6LRlnA Hzy80rtnE+TpViXXguArHEy3eugFbsaj4VO+12Gpmt+7KFsKNnnaGiDzXSkDLwiO33g7 kch8aUblhwFa7ht/B2eVXqcacOr899umqF/bIedfd88ruKAuEyWU72BAsm6HRXjBCPCZ PJbuKOyh8BXKjLlHiSPThWJolXMQIzcZsbYmIzmU3R4hLX52it9gKIofCn0oj4ys1gYE f/Bw== X-Gm-Message-State: AOAM533FYFJ68UOfgzlqBhnzkIZlY9jSMBV7j6J1fSt4rzARp4ByRvOF ZYrciIOsT+/s+EPVRpvNItI= X-Google-Smtp-Source: ABdhPJyEToAVRi2HwgHeQsKjG2kbyTw1/yYkzdHqgBbXx8PgpqCAhUCErULJ9/0nzYZchyhnJtwmGA== X-Received: by 2002:a05:6402:493:: with SMTP id k19mr14846912edv.386.1631556635758; Mon, 13 Sep 2021 11:10:35 -0700 (PDT) Received: from localhost.localdomain.it (host-79-43-5-131.retail.telecomitalia.it. [79.43.5.131]) by smtp.gmail.com with ESMTPSA id d25sm4258999edt.33.2021.09.13.11.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 11:10:35 -0700 (PDT) From: "Fabio M. De Francesco" To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Cc: Pavel Skripkin , "Fabio M . De Francesco" Subject: [PATCH v4 03/18] staging: r8188eu: remove the helpers of rtw_read16() Date: Mon, 13 Sep 2021 20:09:47 +0200 Message-Id: <20210913181002.16651-4-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913181002.16651-1-fmdefrancesco@gmail.com> References: <20210913181002.16651-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 From: Pavel Skripkin Remove the unnecessary _rtw_read16() and usb_read16() and embed their code into the caller (i.e., rtw_read16()). _rtw_read16() is a mere redefinition of rtw_read16() and it is unneeded. usb_read16() was the only functions assigned to the (*_usb_read16) pointer, so we can simply remove it and make a direct call. This patch is in preparation for the _io_ops structure removal. Co-developed-by: Fabio M. De Francesco Signed-off-by: Fabio M. De Francesco Signed-off-by: Pavel Skripkin --- v3->v4: Split a patch into fourteen. v2->v3: No changes. v1->v2: No changes. drivers/staging/r8188eu/core/rtw_io.c | 14 -------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 5 +++-- drivers/staging/r8188eu/include/rtw_io.h | 3 +-- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_io.c b/drivers/staging/r8188eu/core/rtw_io.c index 4c43b6d00178..b5d1c8e52b22 100644 --- a/drivers/staging/r8188eu/core/rtw_io.c +++ b/drivers/staging/r8188eu/core/rtw_io.c @@ -34,20 +34,6 @@ jackson@realtek.com.tw #define rtw_cpu_to_le16(val) cpu_to_le16(val) #define rtw_cpu_to_le32(val) cpu_to_le32(val) -u16 _rtw_read16(struct adapter *adapter, u32 addr) -{ - u16 r_val; - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr); - - _read16 = pintfhdl->io_ops._read16; - - r_val = _read16(pintfhdl, addr); - - return r_val; -} - u32 _rtw_read32(struct adapter *adapter, u32 addr) { u32 r_val; diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 8389deeb1182..8b4fc014d93a 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -109,8 +109,10 @@ u8 rtw_read8(struct adapter *adapter, u32 addr) return data; } -static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr) +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); __le32 data; @@ -540,7 +542,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) { memset((u8 *)pops, 0, sizeof(struct _io_ops)); - pops->_read16 = &usb_read16; pops->_read32 = &usb_read32; pops->_read_port = &usb_read_port; pops->_write8 = &usb_write8; diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 9dc32f7bcae8..527503d3ecc8 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -246,7 +246,7 @@ void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); u8 rtw_read8(struct adapter *adapter, u32 addr); -u16 _rtw_read16(struct adapter *adapter, u32 addr); +u16 rtw_read16(struct adapter *adapter, u32 addr); u32 _rtw_read32(struct adapter *adapter, u32 addr); void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); @@ -267,7 +267,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms); void _rtw_write_port_cancel(struct adapter *adapter); -#define rtw_read16(adapter, addr) _rtw_read16((adapter), (addr)) #define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr)) #define rtw_read_port(adapter, addr, cnt, mem) \ _rtw_read_port((adapter), (addr), (cnt), (mem)) -- 2.33.0