LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Phillip Potter <phil@philpotter.co.uk>
To: gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
	martin@kaiser.cx, straube.linux@gmail.com,
	Larry.Finger@lwfinger.net
Subject: [PATCH 5/6] staging: r8188eu: remove function rtw_hal_free_xmit_priv
Date: Thu, 19 Aug 2021 00:42:52 +0100	[thread overview]
Message-ID: <20210818234253.208271-6-phil@philpotter.co.uk> (raw)
In-Reply-To: <20210818234253.208271-1-phil@philpotter.co.uk>

Remove function rtw_hal_free_xmit_priv in hal/hal_intf.c and its
declaration in include/hal_intf.h, as well as the single call line in
core/rtw_xmit.c. This function now essentially checks a function
pointer which will always be NULL (due to previous patches) and
therefore will never be called.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/r8188eu/core/rtw_xmit.c    | 2 --
 drivers/staging/r8188eu/hal/hal_intf.c     | 6 ------
 drivers/staging/r8188eu/include/hal_intf.h | 1 -
 3 files changed, 9 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index cdfcf94e4986..69f997f44c07 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -220,8 +220,6 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
 	u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
 	u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
 
-	rtw_hal_free_xmit_priv(padapter);
-
 	rtw_mfree_xmit_priv_lock(pxmitpriv);
 
 	if (!pxmitpriv->pxmit_frame_buf)
diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 47af081bafcd..a6d589e89aeb 100644
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -226,12 +226,6 @@ s32 rtw_hal_init_xmit_priv(struct adapter *adapt)
 	return _FAIL;
 }
 
-void rtw_hal_free_xmit_priv(struct adapter *adapt)
-{
-	if (adapt->HalFunc.free_xmit_priv)
-		adapt->HalFunc.free_xmit_priv(adapt);
-}
-
 s32 rtw_hal_init_recv_priv(struct adapter *adapt)
 {
 	if (adapt->HalFunc.init_recv_priv)
diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 37ddb9745350..8a2420095b84 100644
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -356,7 +356,6 @@ s32	rtw_hal_mgnt_xmit(struct adapter *padapter,
 			  struct xmit_frame *pmgntframe);
 
 s32	rtw_hal_init_xmit_priv(struct adapter *padapter);
-void	rtw_hal_free_xmit_priv(struct adapter *padapter);
 
 s32	rtw_hal_init_recv_priv(struct adapter *padapter);
 void	rtw_hal_free_recv_priv(struct adapter *padapter);
-- 
2.31.1


  parent reply	other threads:[~2021-08-18 23:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-18 23:42 [PATCH 0/6] staging: r8188eu: HAL related cleanups Phillip Potter
2021-08-18 23:42 ` [PATCH 1/6] staging: r8188eu: remove _dbg_dump_tx_info function Phillip Potter
2021-08-19  1:34   ` Fabio M. De Francesco
2021-08-18 23:42 ` [PATCH 2/6] staging: r8188eu: remove unused function dump_txrpt_ccx_88e Phillip Potter
2021-08-19  1:38   ` Fabio M. De Francesco
2021-08-18 23:42 ` [PATCH 3/6] staging: r8188eu: remove txrpt_ccx_sw_88e and txrpt_ccx_qtime_88e macros Phillip Potter
2021-08-19  1:56   ` Fabio M. De Francesco
2021-08-18 23:42 ` [PATCH 4/6] staging: r8188eu: remove empty function rtl8188eu_free_xmit_priv Phillip Potter
2021-08-19  2:00   ` Fabio M. De Francesco
2021-08-18 23:42 ` Phillip Potter [this message]
2021-08-19  2:08   ` [PATCH 5/6] staging: r8188eu: remove function rtw_hal_free_xmit_priv Fabio M. De Francesco
2021-08-18 23:42 ` [PATCH 6/6] staging: r8188eu: remove free_xmit_priv field from struct hal_ops Phillip Potter
2021-08-19  3:14   ` Fabio M. De Francesco
2021-08-20 21:56     ` 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=20210818234253.208271-6-phil@philpotter.co.uk \
    --to=phil@philpotter.co.uk \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=martin@kaiser.cx \
    --cc=straube.linux@gmail.com \
    --subject='Re: [PATCH 5/6] staging: r8188eu: remove function rtw_hal_free_xmit_priv' \
    /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

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).