2 files changed, 6 insertions, 11 deletions

diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 5d47c5965c51..0821747e44cf 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1724,9 +1724,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
                 sba_dev->chip_resv.start = PCI_F_EXTEND | 0xfef00000UL;
                 sba_dev->chip_resv.end   = PCI_F_EXTEND | (0xff000000UL - 1) ;
                 err = request_resource(&iomem_resource, &(sba_dev->chip_resv));
-                if (err < 0) {
-                        BUG();
-                }
+                BUG_ON(err < 0);
 
         } else if (IS_PLUTO(sba_dev->iodc)) {
                 int err;
@@ -2185,8 +2183,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)
         int i;
         int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1));  /* rope # */
 
-        if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT))
-                BUG();
+        BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
 
         r->start = r->end = 0;
 
@@ -2228,8 +2225,7 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r )
         int base, size;
         int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1));  /* rope # */
 
-        if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT))
-                BUG();
+        BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
 
         r->start = r->end = 0;
 
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();