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 4/6] staging: r8188eu: remove empty function rtl8188eu_free_xmit_priv
Date: Thu, 19 Aug 2021 00:42:51 +0100	[thread overview]
Message-ID: <20210818234253.208271-5-phil@philpotter.co.uk> (raw)
In-Reply-To: <20210818234253.208271-1-phil@philpotter.co.uk>

Remove empty function rtl8188eu_free_xmit_priv from hal/rtl8188eu_xmit.c
and its declaration from include/rtl8188e_xmit.h, as well as the one
place where it is stored in the free_xmit_priv function pointer of the
HalFunc struct inside padapter. This is safe, as the wrapper function
checks for NULL before calling this function via the function pointer.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/r8188eu/hal/rtl8188eu_xmit.c    | 4 ----
 drivers/staging/r8188eu/hal/usb_halinit.c       | 1 -
 drivers/staging/r8188eu/include/rtl8188e_xmit.h | 1 -
 3 files changed, 6 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index b279309405a2..d22b16cc5a30 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -19,10 +19,6 @@ s32	rtl8188eu_init_xmit_priv(struct adapter *adapt)
 	return _SUCCESS;
 }
 
-void	rtl8188eu_free_xmit_priv(struct adapter *adapt)
-{
-}
-
 static u8 urb_zero_packet_chk(struct adapter *adapt, int sz)
 {
 	u8 set_tx_desc_offset;
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 2cd835cb90f6..5cdabf43d4fd 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -2243,7 +2243,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
 	halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;
 
 	halfunc->init_xmit_priv = &rtl8188eu_init_xmit_priv;
-	halfunc->free_xmit_priv = &rtl8188eu_free_xmit_priv;
 
 	halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;
 	halfunc->free_recv_priv = &rtl8188eu_free_recv_priv;
diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
index e7eb19c4ee9d..f1f2ccfc765e 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
@@ -136,7 +136,6 @@ struct txrpt_ccx_88e {
 void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc,
 			       u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull);
 s32 rtl8188eu_init_xmit_priv(struct adapter *padapter);
-void rtl8188eu_free_xmit_priv(struct adapter *padapter);
 s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *frame);
 s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *frame);
 s32 rtl8188eu_xmit_buf_handler(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 ` Phillip Potter [this message]
2021-08-19  2:00   ` [PATCH 4/6] staging: r8188eu: remove empty function rtl8188eu_free_xmit_priv Fabio M. De Francesco
2021-08-18 23:42 ` [PATCH 5/6] staging: r8188eu: remove function rtw_hal_free_xmit_priv Phillip Potter
2021-08-19  2:08   ` 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-5-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 4/6] staging: r8188eu: remove empty function rtl8188eu_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).