diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-04-02 15:52:48 +0400 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-04-02 15:52:48 +0400 |
| commit | 5d9428de1a9785f10a4339f80b717be665ba51c7 (patch) | |
| tree | 27eeed8a87ef248cec694032463f0d8f3b38fbcc /drivers/net/tokenring | |
| parent | 7e99e9b66336565f0088ea59d848ab187f9689c3 (diff) | |
| download | linux-5d9428de1a9785f10a4339f80b717be665ba51c7.tar.xz | |
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>
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/abyss.c | 3 | ||||
| -rw-r--r-- | drivers/net/tokenring/madgemc.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c index 9345e68c451e..649d8ea354f5 100644 --- a/drivers/net/tokenring/abyss.c +++ b/drivers/net/tokenring/abyss.c @@ -438,8 +438,7 @@ static void __devexit abyss_detach (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); - if (!dev) - BUG(); + BUG_ON(!dev); unregister_netdev(dev); release_region(dev->base_addr-0x10, ABYSS_IO_EXTENT); free_irq(dev->irq, dev); diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 3a25d191ea4a..19e6f4dfd69c 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c @@ -735,8 +735,7 @@ static int __devexit madgemc_remove(struct device *device) struct net_local *tp; struct card_info *card; - if (!dev) - BUG(); + BUG_ON(!dev); tp = dev->priv; card = tp->tmspriv; |