diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-24 18:52:10 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-03-24 18:52:10 +0100 |
| commit | b74945547f0679003ede4d1afcd0aa169059a436 (patch) | |
| tree | f8a50059f602970f3e0d955d0e3c7d150d9056ac /drivers/parisc/superio.c | |
| parent | 089fe1b23da5468bbf02b721472f71f349837a7d (diff) | |
| download | linux-b74945547f0679003ede4d1afcd0aa169059a436.tar.gz linux-b74945547f0679003ede4d1afcd0aa169059a436.tar.bz2 linux-b74945547f0679003ede4d1afcd0aa169059a436.zip | |
BUG_ON() Conversion in drivers/parisc/
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/parisc/superio.c')
| -rw-r--r-- | drivers/parisc/superio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index ba971fecd0d8..ad6d3b28a3a6 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c @@ -157,8 +157,8 @@ superio_init(struct pci_dev *pcidev) if (sio->suckyio_irq_enabled) return; - if (!pdev) BUG(); - if (!sio->usb_pdev) BUG(); + BUG_ON(!pdev); + BUG_ON(!sio->usb_pdev); /* use the IRQ iosapic found for USB INT D... */ pdev->irq = sio->usb_pdev->irq; @@ -474,8 +474,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id) dev->subsystem_vendor, dev->subsystem_device, dev->class); - if (!sio->suckyio_irq_enabled) - BUG(); /* Enabled by PCI_FIXUP_FINAL */ + BUG_ON(!sio->suckyio_irq_enabled); /* Enabled by PCI_FIXUP_FINAL */ if (dev->device == PCI_DEVICE_ID_NS_87560_LIO) { /* Function 1 */ superio_parport_init(); |