Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5d9428de1a9785f10a4339f80b717be665ba51c7

Authored by Eric Sesterhenn
Committed by Adrian Bunk
1 parent 7e99e9b663
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

BUG_ON() Conversion in drivers/net/ 

this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

Showing 15 changed files with 24 additions and 49 deletions Side-by-side Diff

drivers/net/8139cp.c
Diff comments   View file @ 5d9428d
... ... @@ -539,8 +539,7 @@
539 539 unsigned buflen;
540 540  
541 541 skb = cp->rx_skb[rx_tail].skb;
542   - if (!skb)
543   - BUG();
  542 + BUG_ON(!skb);
544 543  
545 544 desc = &cp->rx_ring[rx_tail];
546 545 status = le32_to_cpu(desc->opts1);
... ... @@ -723,8 +722,7 @@
723 722 break;
724 723  
725 724 skb = cp->tx_skb[tx_tail].skb;
726   - if (!skb)
727   - BUG();
  725 + BUG_ON(!skb);
728 726  
729 727 pci_unmap_single(cp->pdev, cp->tx_skb[tx_tail].mapping,
730 728 cp->tx_skb[tx_tail].len, PCI_DMA_TODEVICE);
... ... @@ -1550,8 +1548,7 @@
1550 1548 tmp_stats[i++] = le16_to_cpu(nic_stats->tx_abort);
1551 1549 tmp_stats[i++] = le16_to_cpu(nic_stats->tx_underrun);
1552 1550 tmp_stats[i++] = cp->cp_stats.rx_frags;
1553   - if (i != CP_NUM_STATS)
1554   - BUG();
  1551 + BUG_ON(i != CP_NUM_STATS);
1555 1552  
1556 1553 pci_free_consistent(cp->pdev, sizeof(*nic_stats), nic_stats, dma);
1557 1554 }
... ... @@ -1856,8 +1853,7 @@
1856 1853 struct net_device *dev = pci_get_drvdata(pdev);
1857 1854 struct cp_private *cp = netdev_priv(dev);
1858 1855  
1859   - if (!dev)
1860   - BUG();
  1856 + BUG_ON(!dev);
1861 1857 unregister_netdev(dev);
1862 1858 iounmap(cp->regs);
1863 1859 if (cp->wol_enabled) pci_set_power_state (pdev, PCI_D0);
drivers/net/arcnet/arcnet.c
Diff comments   View file @ 5d9428d
... ... @@ -765,8 +765,7 @@
765 765 BUGMSG(D_DURING, "in arcnet_interrupt\n");
766 766  
767 767 lp = dev->priv;
768   - if (!lp)
769   - BUG();
  768 + BUG_ON(!lp);
770 769  
771 770 spin_lock(&lp->lock);
772 771  
... ... @@ -608,8 +608,7 @@
608 608 struct ring_info *rp = &bp->tx_buffers[cons];
609 609 struct sk_buff *skb = rp->skb;
610 610  
611   - if (unlikely(skb == NULL))
612   - BUG();
  611 + BUG_ON(skb == NULL);
613 612  
614 613 pci_unmap_single(bp->pdev,
615 614 pci_unmap_addr(rp, mapping),
drivers/net/chelsio/sge.c
Diff comments   View file @ 5d9428d
... ... @@ -1093,8 +1093,7 @@
1093 1093 if (likely(e->DataValid)) {
1094 1094 struct freelQ *fl = &sge->freelQ[e->FreelistQid];
1095 1095  
1096   - if (unlikely(!e->Sop || !e->Eop))
1097   - BUG();
  1096 + BUG_ON(!e->Sop || !e->Eop);
1098 1097 if (unlikely(e->Offload))
1099 1098 unexpected_offload(adapter, fl);
1100 1099 else
drivers/net/e1000/e1000_main.c
Diff comments   View file @ 5d9428d
... ... @@ -3308,8 +3308,7 @@
3308 3308  
3309 3309 while (poll_dev != &adapter->polling_netdev[i]) {
3310 3310 i++;
3311   - if (unlikely(i == adapter->num_rx_queues))
3312   - BUG();
  3311 + BUG_ON(i == adapter->num_rx_queues);
3313 3312 }
3314 3313  
3315 3314 if (likely(adapter->num_tx_queues == 1)) {
... ... @@ -203,8 +203,7 @@
203 203 printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
204 204 "your slave devices.\n", dev->name);
205 205  
206   - if (!list_empty(&eql->queue.all_slaves))
207   - BUG();
  206 + BUG_ON(!list_empty(&eql->queue.all_slaves));
208 207  
209 208 eql->min_slaves = 1;
210 209 eql->max_slaves = EQL_DEFAULT_MAX_SLAVES; /* 4 usually... */
drivers/net/irda/sa1100_ir.c
Diff comments   View file @ 5d9428d
... ... @@ -695,8 +695,7 @@
695 695 /*
696 696 * We must not be transmitting...
697 697 */
698   - if (si->txskb)
699   - BUG();
  698 + BUG_ON(si->txskb);
700 699  
701 700 netif_stop_queue(dev);
702 701  
drivers/net/ne2k-pci.c
Diff comments   View file @ 5d9428d
... ... @@ -645,9 +645,7 @@
645 645 {
646 646 struct net_device *dev = pci_get_drvdata(pdev);
647 647  
648   - if (!dev)
649   - BUG();
650   -
  648 + BUG_ON(!dev);
651 649 unregister_netdev(dev);
652 650 release_region(dev->base_addr, NE_IO_EXTENT);
653 651 free_netdev(dev);
drivers/net/ns83820.c
Diff comments   View file @ 5d9428d
... ... @@ -568,8 +568,7 @@
568 568 #endif
569 569  
570 570 sg = dev->rx_info.descs + (next_empty * DESC_SIZE);
571   - if (unlikely(NULL != dev->rx_info.skbs[next_empty]))
572   - BUG();
  571 + BUG_ON(NULL != dev->rx_info.skbs[next_empty]);
573 572 dev->rx_info.skbs[next_empty] = skb;
574 573  
575 574 dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC;
drivers/net/starfire.c
Diff comments   View file @ 5d9428d
... ... @@ -2122,8 +2122,7 @@
2122 2122 struct net_device *dev = pci_get_drvdata(pdev);
2123 2123 struct netdev_private *np = netdev_priv(dev);
2124 2124  
2125   - if (!dev)
2126   - BUG();
  2125 + BUG_ON(!dev);
2127 2126  
2128 2127 unregister_netdev(dev);
2129 2128  
... ... @@ -2966,9 +2966,7 @@
2966 2966 struct sk_buff *skb = ri->skb;
2967 2967 int i;
2968 2968  
2969   - if (unlikely(skb == NULL))
2970   - BUG();
2971   -
  2969 + BUG_ON(skb == NULL);
2972 2970 pci_unmap_single(tp->pdev,
2973 2971 pci_unmap_addr(ri, mapping),
2974 2972 skb_headlen(skb),
2975 2973  
... ... @@ -2979,12 +2977,10 @@
2979 2977 sw_idx = NEXT_TX(sw_idx);
2980 2978  
2981 2979 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
2982   - if (unlikely(sw_idx == hw_idx))
2983   - BUG();
  2980 + BUG_ON(sw_idx == hw_idx);
2984 2981  
2985 2982 ri = &tp->tx_buffers[sw_idx];
2986   - if (unlikely(ri->skb != NULL))
2987   - BUG();
  2983 + BUG_ON(ri->skb != NULL);
2988 2984  
2989 2985 pci_unmap_page(tp->pdev,
2990 2986 pci_unmap_addr(ri, mapping),
... ... @@ -4935,9 +4931,8 @@
4935 4931 {
4936 4932 int i;
4937 4933  
4938   - if (offset == TX_CPU_BASE &&
4939   - (tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
4940   - BUG();
  4934 + BUG_ON(offset == TX_CPU_BASE &&
  4935 + (tp->tg3_flags2 & TG3_FLG2_5705_PLUS));
4941 4936  
4942 4937 if (offset == RX_CPU_BASE) {
4943 4938 for (i = 0; i < 10000; i++) {
drivers/net/tokenring/abyss.c
Diff comments   View file @ 5d9428d
... ... @@ -438,8 +438,7 @@
438 438 {
439 439 struct net_device *dev = pci_get_drvdata(pdev);
440 440  
441   - if (!dev)
442   - BUG();
  441 + BUG_ON(!dev);
443 442 unregister_netdev(dev);
444 443 release_region(dev->base_addr-0x10, ABYSS_IO_EXTENT);
445 444 free_irq(dev->irq, dev);
drivers/net/tokenring/madgemc.c
Diff comments   View file @ 5d9428d
... ... @@ -735,8 +735,7 @@
735 735 struct net_local *tp;
736 736 struct card_info *card;
737 737  
738   - if (!dev)
739   - BUG();
  738 + BUG_ON(!dev);
740 739  
741 740 tp = dev->priv;
742 741 card = tp->tmspriv;
drivers/net/wireless/ipw2200.c
Diff comments   View file @ 5d9428d
... ... @@ -5573,8 +5573,7 @@
5573 5573 case IEEE80211_52GHZ_BAND:
5574 5574 network->mode = IEEE_A;
5575 5575 i = ieee80211_channel_to_index(priv->ieee, priv->channel);
5576   - if (i == -1)
5577   - BUG();
  5576 + BUG_ON(i == -1);
5578 5577 if (geo->a[i].flags & IEEE80211_CH_PASSIVE_ONLY) {
5579 5578 IPW_WARNING("Overriding invalid channel\n");
5580 5579 priv->channel = geo->a[0].channel;
... ... @@ -5587,8 +5586,7 @@
5587 5586 else
5588 5587 network->mode = IEEE_B;
5589 5588 i = ieee80211_channel_to_index(priv->ieee, priv->channel);
5590   - if (i == -1)
5591   - BUG();
  5589 + BUG_ON(i == -1);
5592 5590 if (geo->bg[i].flags & IEEE80211_CH_PASSIVE_ONLY) {
5593 5591 IPW_WARNING("Overriding invalid channel\n");
5594 5592 priv->channel = geo->bg[0].channel;
... ... @@ -6715,8 +6713,7 @@
6715 6713  
6716 6714 switch (priv->ieee->iw_mode) {
6717 6715 case IW_MODE_ADHOC:
6718   - if (!(network->capability & WLAN_CAPABILITY_IBSS))
6719   - BUG();
  6716 + BUG_ON(!(network->capability & WLAN_CAPABILITY_IBSS));
6720 6717  
6721 6718 qos_data = &ibss_data;
6722 6719 break;
drivers/net/yellowfin.c
Diff comments   View file @ 5d9428d
... ... @@ -1441,8 +1441,7 @@
1441 1441 struct net_device *dev = pci_get_drvdata(pdev);
1442 1442 struct yellowfin_private *np;
1443 1443  
1444   - if (!dev)
1445   - BUG();
  1444 + BUG_ON(!dev);
1446 1445 np = netdev_priv(dev);
1447 1446  
1448 1447 pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status,