From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 03/10] staging: rtl8192e: Unwind pointer to pointer to rtl92e_set_channel()
Date: Sat, 18 Nov 2023 09:51:18 +0100 [thread overview]
Message-ID: <a96bac1f34e669a3b2fc4940a0a2d850564a5975.1700296319.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1700296319.git.philipp.g.hortmann@gmail.com>
Replace pointer to function to pointer to rtl92e_set_channel() with
pointer to rtl92e_set_channel(). This increases readability of the code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 13 +------------
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 --
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 98b25768f614..2789f428e4f9 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -226,16 +226,6 @@ static void _rtl92e_tx_timeout(struct net_device *dev, unsigned int txqueue)
netdev_info(dev, "TXTIMEOUT");
}
-static void _rtl92e_set_chan(struct net_device *dev, u8 ch)
-{
- struct r8192_priv *priv = rtllib_priv(dev);
-
- priv->chan = ch;
-
- if (priv->rf_set_chan)
- priv->rf_set_chan(dev, priv->chan);
-}
-
static void _rtl92e_update_cap(struct net_device *dev, u16 cap)
{
struct r8192_priv *priv = rtllib_priv(dev);
@@ -685,7 +675,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev);
priv->rtllib->softmac_hard_start_xmit = _rtl92e_hard_start_xmit;
- priv->rtllib->set_chan = _rtl92e_set_chan;
+ priv->rtllib->set_chan = rtl92e_set_channel;
priv->rtllib->link_change = rtl92e_link_change;
priv->rtllib->softmac_data_hard_start_xmit = _rtl92e_hard_data_xmit;
priv->rtllib->check_nic_enough_desc = _rtl92e_check_nic_enough_desc;
@@ -694,7 +684,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)
priv->rtllib->set_wireless_mode = rtl92e_set_wireless_mode;
priv->rtllib->leisure_ps_leave = rtl92e_leisure_ps_leave;
priv->rtllib->set_bw_mode_handler = rtl92e_set_bw_mode;
- priv->rf_set_chan = rtl92e_set_channel;
priv->rtllib->sta_wake_up = rtl92e_hw_wakeup;
priv->rtllib->enter_sleep_state = rtl92e_enter_sleep;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 9b0be6dff627..348df71e122e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -228,8 +228,6 @@ struct r8192_priv {
struct rt_stats stats;
struct iw_statistics wstats;
- void (*rf_set_chan)(struct net_device *dev, u8 ch);
-
struct rx_desc *rx_ring;
struct sk_buff *rx_buf[MAX_RX_COUNT];
dma_addr_t rx_ring_dma;
--
2.42.0
next prev parent reply other threads:[~2023-11-18 8:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-18 8:50 [PATCH 00/10] staging: rtl8192e: Remove constant variable channel_plan Philipp Hortmann
2023-11-18 8:51 ` [PATCH 01/10] staging: rtl8192e: Remove unused return value of rtl92e_set_channel() Philipp Hortmann
2023-11-18 8:51 ` [PATCH 02/10] staging: rtl8192e: Change parameter "ch" of set_chan() to u8 Philipp Hortmann
2023-11-18 8:51 ` Philipp Hortmann [this message]
2023-11-18 8:51 ` [PATCH 04/10] staging: rtl8192e: Remove equation that results in constant for chnl_plan Philipp Hortmann
2023-11-18 8:51 ` [PATCH 05/10] staging: rtl8192e: Remove constant variable chnl_plan Philipp Hortmann
2023-11-18 8:51 ` [PATCH 06/10] staging: rtl8192e: Remove unused variable eeprom_chnl_plan Philipp Hortmann
2023-11-18 8:51 ` [PATCH 07/10] staging: rtl8192e: Remove equation to check limits of channel Philipp Hortmann
2023-11-18 8:51 ` [PATCH 08/10] staging: rtl8192e: Remove check if channel_array[channel_plan].len != 0 Philipp Hortmann
2023-11-18 8:52 ` [PATCH 09/10] staging: rtl8192e: Remove switch for a constant in dot11d_channel_map() Philipp Hortmann
2023-11-18 8:52 ` [PATCH 10/10] staging: rtl8192e: Remove constant index from channel_array[] Philipp Hortmann
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=a96bac1f34e669a3b2fc4940a0a2d850564a5975.1700296319.git.philipp.g.hortmann@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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
all inboxes | Powered by JetHome®