From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AE8BC433F5 for ; Mon, 13 Sep 2021 18:10:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A9FB610D1 for ; Mon, 13 Sep 2021 18:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346764AbhIMSME (ORCPT ); Mon, 13 Sep 2021 14:12:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346817AbhIMSMA (ORCPT ); Mon, 13 Sep 2021 14:12:00 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45AE7C061766 for ; Mon, 13 Sep 2021 11:10:44 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id i21so23003591ejd.2 for ; Mon, 13 Sep 2021 11:10:44 -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=juToNSL9y2xYueZ02gZQdSCb4zeNxtS+PZPD9ackgoE=; b=KXPReHVxokt1tL0H8LItaBI0ppp1tszpsPQ9hDWzb41Mrz1347cUetsOyeG2ZC3vxt t5E1RqkSY2a+4LhVKRoIAcQlCl5C0CcPvIEkZCufGBzGEaRjCcnBJxTCgeXu6wYLnv94 EcUs8uY8HVkmfknS4SUs2qjP+zJiIgnQvsH/OtjCfoaBrzHEzP/+xoYAZRbtvx//yWqj nSja/dDgwvPez9L9ft+VymTBU0lwSOiY8UXUqxrU9vetG/Vc71WFWEhjRvBhccmXap6y vX7Tu3CsWFbxHeCpSja8GrbyCGD03b8Krj2nYpXJ5CYScB6TPGI7ANdlmrCHuV8bqSRX BXNQ== 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=juToNSL9y2xYueZ02gZQdSCb4zeNxtS+PZPD9ackgoE=; b=ICaQbXCk23WOytUCy/7VbGyN8PVOs7xbANof40+6PHxO7nWgY0y16FjmHLZHs2ZpTT 2RIHjZdPJSTXyad6jKTLgUV4F9ZOg8ANHtbm29OA6F2nM022ilhmqXY253OEOYJ6ZSFA AwwPQ9vOhoBBJmCYWyuPBGRzrTMu01ouDh3VcXwMNT5YhEZRjh8GEsWO2upg/KhiMG0n GVd/XKLXj+rhd3vjrnf9R96ZRMhYWDazIIuODEYGJExIAEFHjOXN3JfGDa+O5qI3cC8e chRPwyccklTMZwMunq8RZbAZCNGBLjxe6gy1dox/8R5L2o6T+/5uFZeIv+hMgghU+qwV +GUg== X-Gm-Message-State: AOAM530zKT5Kqa21bUpiCq/HbM3ug6GSAlF9eI4jxK/xhwgSH3GoWTSL VmZiDFqZMUfZZObsqFyEN3vQovNQOZs= X-Google-Smtp-Source: ABdhPJzw8T5j7PHIUsu+Z0NJxvE72/EKFLEeG0FB1tC6CVB8WzL5g0/5j+nV43rEDHv68vcIndt9Kg== X-Received: by 2002:a17:906:1454:: with SMTP id q20mr14684602ejc.446.1631556642892; Mon, 13 Sep 2021 11:10:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 11:10:42 -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 04/18] staging: r8188eu: remove the helpers of rtw_read32() Date: Mon, 13 Sep 2021 20:09:48 +0200 Message-Id: <20210913181002.16651-5-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavel Skripkin Remove the unnecessary _rtw_readr32() and usb_read32() and embed their code into the caller (i.e., rtw_read32()). _rtw_read32() is a mere redefinition of rtw_read32() and it is unneeded. usb_read32() was the only functions assigned to the (*_usb_read32) 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 b5d1c8e52b22..cb24500cbc6e 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) -u32 _rtw_read32(struct adapter *adapter, u32 addr) -{ - u32 r_val; - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &pio_priv->intf; - u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr); - - _read32 = pintfhdl->io_ops._read32; - - r_val = _read32(pintfhdl, addr); - - return r_val; -} - int _rtw_write8(struct adapter *adapter, u32 addr, u8 val) { struct io_priv *pio_priv = &adapter->iopriv; diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 8b4fc014d93a..39fd9994787d 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -121,8 +121,10 @@ u16 rtw_read16(struct adapter *adapter, u32 addr) return (u16)(le32_to_cpu(data) & 0xffff); } -static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr) +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); __le32 data; @@ -542,7 +544,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) { memset((u8 *)pops, 0, sizeof(struct _io_ops)); - pops->_read32 = &usb_read32; pops->_read_port = &usb_read_port; pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 527503d3ecc8..c53d9c8bd9a7 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -247,7 +247,7 @@ 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); -u32 _rtw_read32(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); void _rtw_read_port_cancel(struct adapter *adapter); @@ -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_read32(adapter, addr) _rtw_read32((adapter), (addr)) #define rtw_read_port(adapter, addr, cnt, mem) \ _rtw_read_port((adapter), (addr), (cnt), (mem)) #define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter)) -- 2.33.0