Commit 15333061 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[NET]: dev_put/dev_hold cleanup 



Get rid of the old __dev_put macro that is just a hold over from pre 2.6
kernel.  And turn dev_hold into an inline instead of a macro.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d0817d1

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ e1000_remove(struct pci_dev *pdev) 
	unregister_netdev(netdev);

#ifdef CONFIG_E1000_NAPI

	for (i = 0; i < adapter->num_rx_queues; i++)

		__dev_put(&adapter->polling_netdev[i]);

		dev_put(&adapter->polling_netdev[i]);

#endif



	if (!e1000_check_phy_reset_block(&adapter->hw))

include/linux/netdevice.h

+4 −2
Original line number Diff line number Diff line
@@ -712,8 +712,10 @@ static inline void dev_put(struct net_device *dev) 
	atomic_dec(&dev->refcnt);

}



#define __dev_put(dev) atomic_dec(&(dev)->refcnt)

#define dev_hold(dev) atomic_inc(&(dev)->refcnt)

static inline void dev_hold(struct net_device *dev)

{

	atomic_inc(&dev->refcnt);

}



/* Carrier loss detection, dial on demand. The functions netif_carrier_on

 * and _off may be called from IRQ context, but it is caller

net/ipv4/igmp.c

+1 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr) 
		dev = ip_dev_find(imr->imr_address.s_addr);

		if (!dev)

			return NULL;

		__dev_put(dev);

		dev_put(dev);

	}



	if (!dev && !ip_route_output_key(&rt, &fl)) {

net/ipv4/ipmr.c

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int vif_add(struct vifctl *vifc, int mrtsock) 
		dev = ip_dev_find(vifc->vifc_lcl_addr.s_addr);

		if (!dev)

			return -EADDRNOTAVAIL;

		__dev_put(dev);

		dev_put(dev);

		break;

	default:

		return -EINVAL;

net/sched/sch_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void dev_watchdog_down(struct net_device *dev) 
{

	spin_lock_bh(&dev->xmit_lock);

	if (del_timer(&dev->watchdog_timer))

		__dev_put(dev);

		dev_put(dev);

	spin_unlock_bh(&dev->xmit_lock);

}