staging: ks7010: convert tasklets to use new tasklet_setup() API

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 <apais@linux.microsoft.com>
Link: https://lore.kernel.org/r/20200916062553.58532-1-allen.lkml@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index 6b2660c..78dc8be 100644 (file)
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -405,9 +405,9 @@ int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,
        return result;
 }
 
-static void rx_event_task(unsigned long dev)
+static void rx_event_task(struct tasklet_struct *t)
 {
-       struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
+       struct ks_wlan_private *priv = from_tasklet(priv, t, rx_bh_task);
        struct rx_device_buffer *rp;
 
        if (rxq_has_space(priv) && priv->dev_state >= DEVICE_STATE_BOOT) {
@@ -618,7 +618,7 @@ static int trx_device_init(struct ks_wlan_private *priv)
        spin_lock_init(&priv->tx_dev.tx_dev_lock);
        spin_lock_init(&priv->rx_dev.rx_dev_lock);
 
-       tasklet_init(&priv->rx_bh_task, rx_event_task, (unsigned long)priv);
+       tasklet_setup(&priv->rx_bh_task, rx_event_task);
 
        return 0;
 }

diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index eaaf6a5..8bc3b7d 100644 (file)
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -2205,9 +2205,9 @@ static void hostif_sme_execute(struct ks_wlan_private *priv, int event)
 }
 
 static
-void hostif_sme_task(unsigned long dev)
+void hostif_sme_task(struct tasklet_struct *t)
 {
-       struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
+       struct ks_wlan_private *priv = from_tasklet(priv, t, sme_task);
 
        if (priv->dev_state < DEVICE_STATE_BOOT)
                return;
@@ -2258,7 +2258,7 @@ static inline void hostif_sme_init(struct ks_wlan_private *priv)
        priv->sme_i.qtail = 0;
        spin_lock_init(&priv->sme_i.sme_spin);
        priv->sme_i.sme_flag = 0;
-       tasklet_init(&priv->sme_task, hostif_sme_task, (unsigned long)priv);
+       tasklet_setup(&priv->sme_task, hostif_sme_task);
 }
 
 static inline void hostif_wpa_init(struct ks_wlan_private *priv)