Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 153330618691694af64f39fb56c9de051862380e

Authored by Stephen Hemminger
Committed by David S. Miller
1 parent 2d0817d11e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 5 changed files with 9 additions and 7 deletions Side-by-side Diff

drivers/net/e1000/e1000_main.c
Diff comments   View file @ 1533306
... ... @@ -920,7 +920,7 @@
920 920 unregister_netdev(netdev);
921 921 #ifdef CONFIG_E1000_NAPI
922 922 for (i = 0; i < adapter->num_rx_queues; i++)
923   - __dev_put(&adapter->polling_netdev[i]);
  923 + dev_put(&adapter->polling_netdev[i]);
924 924 #endif
925 925  
926 926 if (!e1000_check_phy_reset_block(&adapter->hw))
include/linux/netdevice.h
Diff comments   View file @ 1533306
... ... @@ -712,8 +712,10 @@
712 712 atomic_dec(&dev->refcnt);
713 713 }
714 714  
715   -#define __dev_put(dev) atomic_dec(&(dev)->refcnt)
716   -#define dev_hold(dev) atomic_inc(&(dev)->refcnt)
  715 +static inline void dev_hold(struct net_device *dev)
  716 +{
  717 + atomic_inc(&dev->refcnt);
  718 +}
717 719  
718 720 /* Carrier loss detection, dial on demand. The functions netif_carrier_on
719 721 * and _off may be called from IRQ context, but it is caller
... ... @@ -1382,7 +1382,7 @@
1382 1382 dev = ip_dev_find(imr->imr_address.s_addr);
1383 1383 if (!dev)
1384 1384 return NULL;
1385   - __dev_put(dev);
  1385 + dev_put(dev);
1386 1386 }
1387 1387  
1388 1388 if (!dev && !ip_route_output_key(&rt, &fl)) {
... ... @@ -415,10 +415,10 @@
415 415 return -ENOBUFS;
416 416 break;
417 417 case 0:
418   - dev=ip_dev_find(vifc->vifc_lcl_addr.s_addr);
  418 + dev = ip_dev_find(vifc->vifc_lcl_addr.s_addr);
419 419 if (!dev)
420 420 return -EADDRNOTAVAIL;
421   - __dev_put(dev);
  421 + dev_put(dev);
422 422 break;
423 423 default:
424 424 return -EINVAL;
net/sched/sch_generic.c
Diff comments   View file @ 1533306
... ... @@ -234,7 +234,7 @@
234 234 {
235 235 spin_lock_bh(&dev->xmit_lock);
236 236 if (del_timer(&dev->watchdog_timer))
237   - __dev_put(dev);
  237 + dev_put(dev);
238 238 spin_unlock_bh(&dev->xmit_lock);
239 239 }
240 240