openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: natsemi: 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>
This commit is contained in:
Allen Pais 2020-09-14 12:59:34 +05:30 committed by David S. Miller
parent 9ad5a250a9
commit 54e977f013
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/natsemi/ns83820.c
View File

@ -923,10 +923,10 @@ static void rx_irq(struct net_device *ndev)
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
} }
static void rx_action(unsigned long _dev) static void rx_action(struct tasklet_struct *t)
{ {
struct net_device *ndev = (void *)_dev; struct ns83820 *dev = from_tasklet(dev, t, rx_tasklet);
struct ns83820 *dev = PRIV(ndev); struct net_device *ndev = dev->ndev;
rx_irq(ndev); rx_irq(ndev);
writel(ihr, dev->base + IHR); writel(ihr, dev->base + IHR);
@ -1924,7 +1924,7 @@ static int ns83820_init_one(struct pci_dev *pci_dev,
SET_NETDEV_DEV(ndev, &pci_dev->dev); SET_NETDEV_DEV(ndev, &pci_dev->dev);
INIT_WORK(&dev->tq_refill, queue_refill); INIT_WORK(&dev->tq_refill, queue_refill);
tasklet_init(&dev->rx_tasklet, rx_action, (unsigned long)ndev); tasklet_setup(&dev->rx_tasklet, rx_action);
err = pci_enable_device(pci_dev); err = pci_enable_device(pci_dev);
if (err) { if (err) {