diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-24 12:52:10 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-03-24 12:52:10 -0500 |
commit | b74945547f0679003ede4d1afcd0aa169059a436 (patch) | |
tree | f8a50059f602970f3e0d955d0e3c7d150d9056ac /drivers/parisc/superio.c | |
parent | 089fe1b23da5468bbf02b721472f71f349837a7d (diff) |
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) | |||
157 | if (sio->suckyio_irq_enabled) | 157 | if (sio->suckyio_irq_enabled) |
158 | return; | 158 | return; |
159 | 159 | ||
160 | if (!pdev) BUG(); | 160 | BUG_ON(!pdev); |
161 | if (!sio->usb_pdev) BUG(); | 161 | BUG_ON(!sio->usb_pdev); |
162 | 162 | ||
163 | /* use the IRQ iosapic found for USB INT D... */ | 163 | /* use the IRQ iosapic found for USB INT D... */ |
164 | pdev->irq = sio->usb_pdev->irq; | 164 | pdev->irq = sio->usb_pdev->irq; |
@@ -474,8 +474,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
474 | dev->subsystem_vendor, dev->subsystem_device, | 474 | dev->subsystem_vendor, dev->subsystem_device, |
475 | dev->class); | 475 | dev->class); |
476 | 476 | ||
477 | if (!sio->suckyio_irq_enabled) | 477 | BUG_ON(!sio->suckyio_irq_enabled); /* Enabled by PCI_FIXUP_FINAL */ |
478 | BUG(); /* Enabled by PCI_FIXUP_FINAL */ | ||
479 | 478 | ||
480 | if (dev->device == PCI_DEVICE_ID_NS_87560_LIO) { /* Function 1 */ | 479 | if (dev->device == PCI_DEVICE_ID_NS_87560_LIO) { /* Function 1 */ |
481 | superio_parport_init(); | 480 | superio_parport_init(); |