summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/ni
diff options
context:
space:
mode:
authorAllen Pais <apais@linux.microsoft.com>2020-09-14 10:29:36 +0300
committerDavid S. Miller <davem@davemloft.net>2020-09-14 23:02:38 +0300
commitf246d129fe8cec16f088c12185a4e986ef682c02 (patch)
tree33a2e064d3670ea937764bbc774bc4bb8d41fb5a /drivers/net/ethernet/ni
parent436b7d950e2fe839d10cae6243744c3efaba6451 (diff)
downloadlinux-f246d129fe8cec16f088c12185a4e986ef682c02.tar.xz
net: nixge: 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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ni')
-rw-r--r--drivers/net/ethernet/ni/nixge.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
index 4075f5e59955..a6861df9904f 100644
--- a/drivers/net/ethernet/ni/nixge.c
+++ b/drivers/net/ethernet/ni/nixge.c
@@ -787,9 +787,9 @@ out:
return IRQ_HANDLED;
}
-static void nixge_dma_err_handler(unsigned long data)
+static void nixge_dma_err_handler(struct tasklet_struct *t)
{
- struct nixge_priv *lp = (struct nixge_priv *)data;
+ struct nixge_priv *lp = from_tasklet(lp, t, dma_err_tasklet);
struct nixge_hw_dma_bd *cur_p;
struct nixge_tx_skb *tx_skb;
u32 cr, i;
@@ -879,8 +879,7 @@ static int nixge_open(struct net_device *ndev)
phy_start(phy);
/* Enable tasklets for Axi DMA error handling */
- tasklet_init(&priv->dma_err_tasklet, nixge_dma_err_handler,
- (unsigned long)priv);
+ tasklet_setup(&priv->dma_err_tasklet, nixge_dma_err_handler);
napi_enable(&priv->napi);