From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 2D1943FC7 for ; Mon, 6 Sep 2021 19:03:00 +0000 (UTC) Received: by mail-ed1-f49.google.com with SMTP id i6so10662745edu.1 for ; Mon, 06 Sep 2021 12:03:00 -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=kA6rRAWAw8ITTs1/xvT8KBL+Svn0youmgQljH1vzQ29tRLaPZNAF1zX9IyMQEmt5Cb ebaa5MAo2LSQ+Wu/LmNr2qDu8FJsFFw7u0+hRmNaoHD3fanqw7xJZYDM86/OJoka1C9a sMROREaRCwy0otNTcjYGuB+t4a7f2P5Gl+8QT84GTWBlUsZm3B6T4w2pMtsez7b/zi2A IRKJDfITdS/BBzQ2+YKONtmoAGk1fY2OnyjHsTMyAwC+c4aqBaRpnyC7u2jSRjOUuT23 5wUuCxIhIYZjy5pfAwbxDUsLhzN6Htz+mtSlOX1binS77xwHhl2Ikjm4g/VLnaEnH6Y/ R2lw== 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=B6/p1cc8yda0Z3KOXyKcouc4I8QnxV3BwBOfDMXWnfknodw9+abhrR9BAEGdZMluCY fofjZvQojsRzBFnyyxa+pNhF+WQeD3qSDQ8Q2h1sqNSh52ajWpNU3XZz4JJgwEzyyM37 IoMXzYxQMG9FsgGfIFEcBfI/wXsPNrirVXnSlTFmzcXYGPECEYNPV9l5jTl94ZU1GGep S0k/hOm3EiY+LFDjIsckAUbtaiBkGquP1udnbKqqEV7JrK7Oa+HbzsYYG75DAYcFkCu7 EdnoE0eLCVu3m6c45Bq+5bRnlbLYWbgP03u+boqoY0V6ltDWJvSBNJp4Tg+44HPsV47q kjWA== X-Gm-Message-State: AOAM532a1x+nIagHW/+uME3Qcx8HWIxOSo0FIEenYJ8YxbMo4ySrnRVK voPO1YvTbkRptFeeCLt8KdM= X-Google-Smtp-Source: ABdhPJy9T10Hhmo4mmab6+qjWMmlVJXec2ubUDpi7LJbhpRv0MmC4XuAbpUjVApqzpRZ2by0k7w3KA== X-Received: by 2002:aa7:c857:: with SMTP id g23mr14798876edt.219.1630954978639; Mon, 06 Sep 2021 12:02:58 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::8fe1]) by smtp.gmail.com with ESMTPSA id k15sm4372018ejb.92.2021.09.06.12.02.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 12:02:58 -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 v3 18/40] staging: r8188eu: remove sreset_xmit_status_check from hal_ops Date: Mon, 6 Sep 2021 21:02:01 +0200 Message-Id: <20210906190223.11396-19-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210906190223.11396-1-straube.linux@gmail.com> References: <20210906190223.11396-1-straube.linux@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 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