From: Allen Pais <allen.cryptic@gmail.com>
To: kvalo@codeaurora.org, kuba@kernel.org, jirislaby@kernel.org,
mickflemm@gmail.com, mcgrof@kernel.org, chunkeey@googlemail.com,
Larry.Finger@lwfinger.net, stas.yakovlev@gmail.com,
helmut.schaa@googlemail.com, pkshih@realtek.com,
yhchuang@realtek.com, dsd@gentoo.org, kune@deine-taler.de
Cc: keescook@chromium.org, ath11k@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org, b43-dev@lists.infradead.org,
brcm80211-dev-list.pdl@broadcom.com,
brcm80211-dev-list@cypress.com, Allen Pais <allen.lkml@gmail.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [PATCH 08/16] wireless: ipw2x00: convert tasklets to use new tasklet_setup() API
Date: Mon, 17 Aug 2020 14:36:29 +0530 [thread overview]
Message-ID: <20200817090637.26887-9-allen.cryptic@gmail.com> (raw)
In-Reply-To: <20200817090637.26887-1-allen.cryptic@gmail.com>
From: Allen Pais <allen.lkml@gmail.com>
In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.
Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
drivers/net/wireless/intel/ipw2x00/ipw2100.c | 9 ++++-----
drivers/net/wireless/intel/ipw2x00/ipw2200.c | 7 +++----
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 461e955aa259..b7fbfc77b612 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -3204,9 +3204,9 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
}
}
-static void ipw2100_irq_tasklet(unsigned long data)
+static void ipw2100_irq_tasklet(struct tasklet_struct *t)
{
- struct ipw2100_priv *priv = (struct ipw2100_priv *)data;
+ struct ipw2100_priv *priv = from_tasklet(priv, t, irq_tasklet);
struct net_device *dev = priv->net_dev;
unsigned long flags;
u32 inta, tmp;
@@ -6005,7 +6005,7 @@ static void ipw2100_rf_kill(struct work_struct *work)
spin_unlock_irqrestore(&priv->low_lock, flags);
}
-static void ipw2100_irq_tasklet(unsigned long data);
+static void ipw2100_irq_tasklet(struct tasklet_struct *t);
static const struct net_device_ops ipw2100_netdev_ops = {
.ndo_open = ipw2100_open,
@@ -6135,8 +6135,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill);
INIT_DELAYED_WORK(&priv->scan_event, ipw2100_scan_event);
- tasklet_init(&priv->irq_tasklet,
- ipw2100_irq_tasklet, (unsigned long)priv);
+ tasklet_setup(&priv->irq_tasklet, ipw2100_irq_tasklet);
/* NOTE: We do not start the deferred work for status checks yet */
priv->stop_rf_kill = 1;
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index 129ef2f6248a..5af1c548a564 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -1945,9 +1945,9 @@ static void notify_wx_assoc_event(struct ipw_priv *priv)
wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
}
-static void ipw_irq_tasklet(unsigned long data)
+static void ipw_irq_tasklet(struct tasklet_struct *t)
{
- struct ipw_priv *priv = (struct ipw_priv *)data;
+ struct ipw_priv *priv = from_tasklet(priv, t, irq_tasklet);
u32 inta, inta_mask, handled = 0;
unsigned long flags;
int rc = 0;
@@ -10673,8 +10673,7 @@ static void ipw_setup_deferred_work(struct ipw_priv *priv)
INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate);
#endif /* CONFIG_IPW2200_QOS */
- tasklet_init(&priv->irq_tasklet,
- ipw_irq_tasklet, (unsigned long)priv);
+ tasklet_setup(&priv->irq_tasklet, ipw_irq_tasklet);
}
static void shim__set_security(struct net_device *dev,
--
2.17.1
next prev parent reply other threads:[~2020-08-17 9:08 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 9:06 [PATCH 00/16] wirless: convert tasklets to use new tasklet_setup() Allen Pais
2020-08-17 9:06 ` [PATCH 01/16] wireless: ath5k: convert tasklets to use new tasklet_setup() API Allen Pais
2020-08-27 10:15 ` Kalle Valo
[not found] ` <20200827101540.6589BC433CB@smtp.codeaurora.org>
2020-08-27 10:44 ` Allen Pais
2020-09-07 16:32 ` Kalle Valo
2020-08-17 9:06 ` [PATCH 02/16] wireless: ath9k: " Allen Pais
2020-08-27 10:16 ` Kalle Valo
2020-08-17 9:06 ` [PATCH 03/16] wireless: ath: " Allen Pais
2020-08-17 19:12 ` Christian Lamparter
2020-08-27 10:21 ` Kalle Valo
2020-08-17 9:06 ` [PATCH 04/16] wireless: ath11k: " Allen Pais
2020-08-31 15:14 ` Kalle Valo
2020-08-17 9:06 ` [PATCH 05/16] wireless: atmel: " Allen Pais
2020-08-27 13:23 ` [05/16] " Kalle Valo
2020-08-27 18:17 ` Kees Cook
2020-08-17 9:06 ` [PATCH 06/16] wireless: b43legacy: " Allen Pais
2020-08-17 9:06 ` [PATCH 07/16] wireless: brcm80211: " Allen Pais
2020-08-17 10:15 ` Arend Van Spriel
2020-08-17 9:06 ` Allen Pais [this message]
2020-08-17 9:06 ` [PATCH 09/16] wireless: iwlegacy: " Allen Pais
2020-08-17 9:06 ` [PATCH 10/16] wireless: intersil: " Allen Pais
2020-09-16 13:44 ` Lee Jones
2020-08-17 9:06 ` [PATCH 11/16] wireless: marvell: " Allen Pais
2020-08-17 9:06 ` [PATCH 12/16] wireless: mediatek: " Allen Pais
2020-09-01 9:25 ` Kalle Valo
2020-08-17 9:06 ` [PATCH 13/16] wireless: quantenna: " Allen Pais
2020-08-17 9:06 ` [PATCH 14/16] wireless: ralink: " Allen Pais
2020-08-17 9:06 ` [PATCH 15/16] wireless: realtek: " Allen Pais
2020-08-17 9:06 ` [PATCH 16/16] wireless: zydas: " Allen Pais
2020-08-18 5:44 ` [PATCH 00/16] wirless: convert tasklets to use new tasklet_setup() Jiri Slaby
2020-08-18 9:14 ` Allen
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=20200817090637.26887-9-allen.cryptic@gmail.com \
--to=allen.cryptic@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=allen.lkml@gmail.com \
--cc=ath11k@lists.infradead.org \
--cc=b43-dev@lists.infradead.org \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=brcm80211-dev-list@cypress.com \
--cc=chunkeey@googlemail.com \
--cc=dsd@gentoo.org \
--cc=helmut.schaa@googlemail.com \
--cc=jirislaby@kernel.org \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=kune@deine-taler.de \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=mickflemm@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pkshih@realtek.com \
--cc=romain.perier@gmail.com \
--cc=stas.yakovlev@gmail.com \
--cc=yhchuang@realtek.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).