From: Phillip Potter <phil@philpotter.co.uk>
To: gregkh@linuxfoundation.org
Cc: straube.linux@gmail.com, fmdefrancesco@gmail.com,
Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] staging: r8188eu: remove rtw_hal_c2h_handler function
Date: Sat, 28 Aug 2021 22:24:53 +0100 [thread overview]
Message-ID: <20210828212453.898-4-phil@philpotter.co.uk> (raw)
In-Reply-To: <20210828212453.898-1-phil@philpotter.co.uk>
Remove rtw_hal_c2h_handler function from hal/hal_intf.c, as well as its
declaration in include/hal_intf.h, and remove its one remaining caller
within core/rtw_cmd.c.
This function was a wrapper function, then simplified to always return
_FAIL. Since it has no further use, remove it, as part of ongoing
efforts to simplify and remove the HAL layer of the driver.
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
drivers/staging/r8188eu/core/rtw_cmd.c | 2 --
drivers/staging/r8188eu/hal/hal_intf.c | 5 -----
drivers/staging/r8188eu/include/hal_intf.h | 2 --
3 files changed, 9 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index b520c6b43c03..5222863f8d66 100644
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -1898,8 +1898,6 @@ static void c2h_wk_callback(struct work_struct *work)
}
if (ccx_id_filter(c2h_evt->id)) {
- /* Handle CCX report here */
- rtw_hal_c2h_handler(adapter, c2h_evt);
kfree(c2h_evt);
} else {
#ifdef CONFIG_88EU_P2P
diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 0c835f9cd181..bcc77da06c08 100644
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -426,11 +426,6 @@ void rtw_hal_reset_security_engine(struct adapter *adapter)
adapter->HalFunc.hal_reset_security_engine(adapter);
}
-s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt)
-{
- return _FAIL;
-}
-
c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter)
{
return adapter->HalFunc.c2h_id_filter_ccx;
diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 4603f9212030..954de3ab2613 100644
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -400,8 +400,6 @@ int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame,
void rtw_hal_notch_filter(struct adapter *adapter, bool enable);
void rtw_hal_reset_security_engine(struct adapter *adapter);
-s32 rtw_hal_c2h_handler(struct adapter *adapter,
- struct c2h_evt_hdr *c2h_evt);
c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter);
void indicate_wx_scan_complete_event(struct adapter *padapter);
u8 rtw_do_join(struct adapter *padapter);
--
2.31.1
next prev parent reply other threads:[~2021-08-28 21:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-28 21:24 [PATCH 0/3] staging: r8188eu: cleanup c2h_handler code Phillip Potter
2021-08-28 21:24 ` [PATCH 1/3] staging: r8188eu: remove c2h_handler field from struct hal_ops Phillip Potter
2021-08-28 21:24 ` [PATCH 2/3] staging: r8188eu: simplify c2h_evt_hdl function Phillip Potter
2021-08-29 8:52 ` Fabio M. De Francesco
2021-08-29 10:49 ` Phillip Potter
2021-08-29 12:35 ` Fabio M. De Francesco
2021-08-29 11:54 ` Pavel Skripkin
2021-08-29 23:18 ` Phillip Potter
2021-08-30 8:06 ` Pavel Skripkin
2021-08-28 21:24 ` Phillip Potter [this message]
2021-08-29 12:48 ` [PATCH 0/3] staging: r8188eu: cleanup c2h_handler code Fabio M. De Francesco
2021-08-29 22:59 ` Phillip Potter
2021-08-29 15:04 ` Michael Straube
2021-08-29 22:57 ` Phillip Potter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210828212453.898-4-phil@philpotter.co.uk \
--to=phil@philpotter.co.uk \
--cc=Larry.Finger@lwfinger.net \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).