Commit f246d129 authored by Allen Pais's avatar Allen Pais Committed by David S. Miller

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: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <apais@linux.microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 436b7d95
...@@ -787,9 +787,9 @@ static irqreturn_t nixge_rx_irq(int irq, void *_ndev) ...@@ -787,9 +787,9 @@ static irqreturn_t nixge_rx_irq(int irq, void *_ndev)
return IRQ_HANDLED; 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_hw_dma_bd *cur_p;
struct nixge_tx_skb *tx_skb; struct nixge_tx_skb *tx_skb;
u32 cr, i; u32 cr, i;
...@@ -879,8 +879,7 @@ static int nixge_open(struct net_device *ndev) ...@@ -879,8 +879,7 @@ static int nixge_open(struct net_device *ndev)
phy_start(phy); phy_start(phy);
/* Enable tasklets for Axi DMA error handling */ /* Enable tasklets for Axi DMA error handling */
tasklet_init(&priv->dma_err_tasklet, nixge_dma_err_handler, tasklet_setup(&priv->dma_err_tasklet, nixge_dma_err_handler);
(unsigned long)priv);
napi_enable(&priv->napi); napi_enable(&priv->napi);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment