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.8 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,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 89BEBC433EF for ; Mon, 6 Sep 2021 18:55:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7311E6103E for ; Mon, 6 Sep 2021 18:55:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245183AbhIFS4F (ORCPT ); Mon, 6 Sep 2021 14:56:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244997AbhIFSzY (ORCPT ); Mon, 6 Sep 2021 14:55:24 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 470A0C0617AD for ; Mon, 6 Sep 2021 11:54:17 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a25so15100726ejv.6 for ; Mon, 06 Sep 2021 11:54:17 -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=kWKIkb6qgsNd1sghd+Gu94KZJMj3gN+DQLl2UZMTmdk=; b=fX/9rV0qjOVmK2NDhowM4YFQ8527hkq8+4Eu8b1X47eXJrtS7Vo5TuO9cilD90nCJS DFFB0S60OlAxFKVUuF9UPa3I7CWhwLBTHTRqoIf7ZiDXDBxirglVyU+lm/obEB7uWQWn eaA4nolw6DAPe9sjteJS5ZIopN7V/8lgK5wxSWg+jEj0dmxfP7lSjuDFD2eRnHD23mVV YKJ7zNte180T+8o9kH3N8hG08e/ILTrTbI2ERbNG8L7RgWEMP+Wj+KEs5eavLMXxLL9T n8hsSUBLnIjyyG8o9TjMcqqooc839gQs/h7PiAZrmhKY9G1uX3LosTZabQqMFxS3CY7q YSfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kWKIkb6qgsNd1sghd+Gu94KZJMj3gN+DQLl2UZMTmdk=; b=qqyMh3SL2gnGhnF7vz8Fs5Apr7t3x8Z6V+CESV1voPNV3LCC454I/MWyXFJV79riUj Z3ezBlT4ODNC3US4abjZizJeBWQwJ408ynYMRfxekJa3PXDXpZf53s1Z6alGL9dLJGRR EcpKC1wvHFTjzAI1fjOa3fSOLCk4K5ufURBM5xMkSiVDgj/YR/oUnkt8An7ETBgC11Jp sOPIkySLDaJ1jjy+Oz9W1fh12ftcaLwlxQkpBBG7rzMBgoySojLhW4jkdIMv/VNyfSCO yvworB+tmeLKzh2/3ojq2ejJJYAmWqIXHEoefxkqn0WpE5XuIzJtmAIGGqR0OFgzk2XN hfaw== X-Gm-Message-State: AOAM533i2OgR7Ok8OKReEqTROpa5o3dZWyC5JUsdOWfe/eqej4w0xlso ySGVXP8hU720TvmLpzrVuC0= X-Google-Smtp-Source: ABdhPJx8SzfH3ussyQWxFySZ1rLzql7eLYYkkkmGmJwJZypd3TxjT2pPuf5CVg45/oPBj0XT7caHtg== X-Received: by 2002:a17:907:75d0:: with SMTP id jl16mr14789312ejc.166.1630954455918; Mon, 06 Sep 2021 11:54:15 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::8fe1]) by smtp.gmail.com with ESMTPSA id kk2sm4329128ejc.114.2021.09.06.11.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 11:54:15 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 18/40] staging: r8188eu: remove sreset_xmit_status_check from hal_ops Date: Mon, 6 Sep 2021 20:53:05 +0200 Message-Id: <20210906185327.10326-19-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210906185327.10326-1-straube.linux@gmail.com> References: <20210906185327.10326-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove sreset_xmit_status_check from hal_ops and remove its wrapper rtw_hal_sreset_xmit_status_check(). Call rtl8188e_sreset_xmit_status_check() directly instead. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 3 ++- drivers/staging/r8188eu/hal/hal_intf.c | 6 ------ drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 1 - drivers/staging/r8188eu/include/hal_intf.h | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c index 67b4fe1304a5..a52c17dd2e5a 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -10,6 +10,7 @@ #include "../include/rtw_br_ext.h" #include "../include/rtw_mlme_ext.h" #include "../include/rtl8188e_dm.h" +#include "../include/rtl8188e_sreset.h" /* Caller and the rtw_cmd_thread can protect cmd_q by spin_lock. @@ -1492,7 +1493,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) expire_timeout_chk(padapter); #endif - rtw_hal_sreset_xmit_status_check(padapter); + rtl8188e_sreset_xmit_status_check(padapter); linked_status_chk(padapter); traffic_status_watchdog(padapter); diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index 51f6160f7dec..b1a71a8fdf38 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -221,12 +221,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *adapt, adapt->HalFunc.AntDivCompareHandler(adapt, dst, src); } -void rtw_hal_sreset_xmit_status_check(struct adapter *adapt) -{ - if (adapt->HalFunc.sreset_xmit_status_check) - adapt->HalFunc.sreset_xmit_status_check(adapt); -} - void rtw_hal_sreset_linked_status_check(struct adapter *adapt) { if (adapt->HalFunc.sreset_linked_status_check) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index f9852eae7c74..9b44fd2d93d7 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -1803,7 +1803,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite; pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite; - pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check; pHalFunc->sreset_linked_status_check = &rtl8188e_sreset_linked_status_check; pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 1a85f11ba596..2f4bc16aeabd 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -193,7 +193,6 @@ struct hal_ops { u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); - void (*sreset_xmit_status_check)(struct adapter *padapter); void (*sreset_linked_status_check) (struct adapter *padapter); u8 (*sreset_get_wifi_status)(struct adapter *padapter); @@ -271,7 +270,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src); -void rtw_hal_sreset_xmit_status_check(struct adapter *padapter); void rtw_hal_sreset_linked_status_check(struct adapter *padapter); u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter); -- 2.33.0