Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: alteon: convert tasklets to use new tasklet_setup() API

Browse Source 
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:20 +05:30 committed by David S. Miller
parent e059c6f340
commit 9c59cc79d6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/alteon/acenic.c
View File

@ -465,6 +465,7 @@ static int acenic_probe_one(struct pci_dev *pdev,
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
ap = netdev_priv(dev); ap = netdev_priv(dev);
ap->ndev = dev;
ap->pdev = pdev; ap->pdev = pdev;
ap->name = pci_name(pdev); ap->name = pci_name(pdev);
@ -1562,10 +1563,10 @@ static void ace_watchdog(struct net_device *data, unsigned int txqueue)
} }
static void ace_tasklet(unsigned long arg) static void ace_tasklet(struct tasklet_struct *t)
{ {
struct net_device *dev = (struct net_device *) arg; struct ace_private *ap = from_tasklet(ap, t, ace_tasklet);
struct ace_private *ap = netdev_priv(dev); struct net_device *dev = ap->ndev;
int cur_size; int cur_size;
cur_size = atomic_read(&ap->cur_rx_bufs); cur_size = atomic_read(&ap->cur_rx_bufs);
@ -2269,7 +2270,7 @@ static int ace_open(struct net_device *dev)
/* /*
* Setup the bottom half rx ring refill handler * Setup the bottom half rx ring refill handler
*/ */
tasklet_init(&ap->ace_tasklet, ace_tasklet, (unsigned long)dev); tasklet_setup(&ap->ace_tasklet, ace_tasklet);
return 0; return 0;
} }

3
drivers/net/ethernet/alteon/acenic.h
View File

@ -633,6 +633,7 @@ struct ace_skb
*/ */
struct ace_private struct ace_private
{ {
struct net_device *ndev; /* backpointer */
struct ace_info *info; struct ace_info *info;
struct ace_regs __iomem *regs; /* register base */ struct ace_regs __iomem *regs; /* register base */
struct ace_skb *skb; struct ace_skb *skb;
@ -776,7 +777,7 @@ static int ace_open(struct net_device *dev);
static netdev_tx_t ace_start_xmit(struct sk_buff *skb, static netdev_tx_t ace_start_xmit(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
static int ace_close(struct net_device *dev); static int ace_close(struct net_device *dev);
static void ace_tasklet(unsigned long dev); static void ace_tasklet(struct tasklet_struct *t);
static void ace_dump_trace(struct ace_private *ap); static void ace_dump_trace(struct ace_private *ap);
static void ace_set_multicast_list(struct net_device *dev); static void ace_set_multicast_list(struct net_device *dev);
static int ace_change_mtu(struct net_device *dev, int new_mtu); static int ace_change_mtu(struct net_device *dev, int new_mtu);