netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 06/16] wireless: b43legacy: convert tasklets to use new tasklet_setup() API
Date: Mon, 17 Aug 2020 14:36:27 +0530	[thread overview]
Message-ID: <20200817090637.26887-7-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/broadcom/b43legacy/main.c | 8 +++-----
 drivers/net/wireless/broadcom/b43legacy/pio.c  | 7 +++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c
index 2eaf481f03f1..15d592cf056c 100644
--- a/drivers/net/wireless/broadcom/b43legacy/main.c
+++ b/drivers/net/wireless/broadcom/b43legacy/main.c
@@ -1275,9 +1275,9 @@ static void handle_irq_ucode_debug(struct b43legacy_wldev *dev)
 }
 
 /* Interrupt handler bottom-half */
-static void b43legacy_interrupt_tasklet(unsigned long data)
+static void b43legacy_interrupt_tasklet(struct tasklet_struct *t)
 {
-	struct b43legacy_wldev *dev = (struct b43legacy_wldev *)data;
+	struct b43legacy_wldev *dev = from_tasklet(dev, t, isr_tasklet);
 	u32 reason;
 	u32 dma_reason[ARRAY_SIZE(dev->dma_reason)];
 	u32 merged_dma_reason = 0;
@@ -3741,9 +3741,7 @@ static int b43legacy_one_core_attach(struct ssb_device *dev,
 	wldev->wl = wl;
 	b43legacy_set_status(wldev, B43legacy_STAT_UNINIT);
 	wldev->bad_frames_preempt = modparam_bad_frames_preempt;
-	tasklet_init(&wldev->isr_tasklet,
-		     b43legacy_interrupt_tasklet,
-		     (unsigned long)wldev);
+	tasklet_setup(&wldev->isr_tasklet, b43legacy_interrupt_tasklet);
 	if (modparam_pio)
 		wldev->__using_pio = true;
 	INIT_LIST_HEAD(&wldev->list);
diff --git a/drivers/net/wireless/broadcom/b43legacy/pio.c b/drivers/net/wireless/broadcom/b43legacy/pio.c
index cbb761378619..aac413d0f629 100644
--- a/drivers/net/wireless/broadcom/b43legacy/pio.c
+++ b/drivers/net/wireless/broadcom/b43legacy/pio.c
@@ -264,9 +264,9 @@ static int pio_tx_packet(struct b43legacy_pio_txpacket *packet)
 	return 0;
 }
 
-static void tx_tasklet(unsigned long d)
+static void tx_tasklet(struct tasklet_struct *t)
 {
-	struct b43legacy_pioqueue *queue = (struct b43legacy_pioqueue *)d;
+	struct b43legacy_pioqueue *queue = from_tasklet(queue, t, txtask);
 	struct b43legacy_wldev *dev = queue->dev;
 	unsigned long flags;
 	struct b43legacy_pio_txpacket *packet, *tmp_packet;
@@ -331,8 +331,7 @@ struct b43legacy_pioqueue *b43legacy_setup_pioqueue(struct b43legacy_wldev *dev,
 	INIT_LIST_HEAD(&queue->txfree);
 	INIT_LIST_HEAD(&queue->txqueue);
 	INIT_LIST_HEAD(&queue->txrunning);
-	tasklet_init(&queue->txtask, tx_tasklet,
-		     (unsigned long)queue);
+	tasklet_setup(&queue->txtask, tx_tasklet);
 
 	value = b43legacy_read32(dev, B43legacy_MMIO_MACCTL);
 	value &= ~B43legacy_MACCTL_BE;
-- 
2.17.1


  parent reply	other threads:[~2020-08-17  9:10 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 ` Allen Pais [this message]
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 ` [PATCH 08/16] wireless: ipw2x00: " Allen Pais
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-7-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).