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

net: macb: 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 d8d36de9
...@@ -1466,9 +1466,9 @@ static int macb_poll(struct napi_struct *napi, int budget) ...@@ -1466,9 +1466,9 @@ static int macb_poll(struct napi_struct *napi, int budget)
return work_done; return work_done;
} }
static void macb_hresp_error_task(unsigned long data) static void macb_hresp_error_task(struct tasklet_struct *t)
{ {
struct macb *bp = (struct macb *)data; struct macb *bp = from_tasklet(bp, t, hresp_err_tasklet);
struct net_device *dev = bp->dev; struct net_device *dev = bp->dev;
struct macb_queue *queue; struct macb_queue *queue;
unsigned int q; unsigned int q;
...@@ -4560,8 +4560,7 @@ static int macb_probe(struct platform_device *pdev) ...@@ -4560,8 +4560,7 @@ static int macb_probe(struct platform_device *pdev)
goto err_out_unregister_mdio; goto err_out_unregister_mdio;
} }
tasklet_init(&bp->hresp_err_tasklet, macb_hresp_error_task, tasklet_setup(&bp->hresp_err_tasklet, macb_hresp_error_task);
(unsigned long)bp);
netdev_info(dev, "Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\n", netdev_info(dev, "Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\n",
macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID), macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID),
......
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