aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-24 12:52:10 -0500
committerAdrian Bunk <bunk@stusta.de>2006-03-24 12:52:10 -0500
commitb74945547f0679003ede4d1afcd0aa169059a436 (patch)
treef8a50059f602970f3e0d955d0e3c7d150d9056ac
parent089fe1b23da5468bbf02b721472f71f349837a7d (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>
-rw-r--r--drivers/parisc/sba_iommu.c10
-rw-r--r--drivers/parisc/superio.c7
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,
1724 sba_dev->chip_resv.start = PCI_F_EXTEND | 0xfef00000UL; 1724 sba_dev->chip_resv.start = PCI_F_EXTEND | 0xfef00000UL;
1725 sba_dev->chip_resv.end = PCI_F_EXTEND | (0xff000000UL - 1) ; 1725 sba_dev->chip_resv.end = PCI_F_EXTEND | (0xff000000UL - 1) ;
1726 err = request_resource(&iomem_resource, &(sba_dev->chip_resv)); 1726 err = request_resource(&iomem_resource, &(sba_dev->chip_resv));
1727 if (err < 0) { 1727 BUG_ON(err < 0);
1728 BUG();
1729 }
1730 1728
1731 } else if (IS_PLUTO(sba_dev->iodc)) { 1729 } else if (IS_PLUTO(sba_dev->iodc)) {
1732 int err; 1730 int err;
@@ -2185,8 +2183,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)
2185 int i; 2183 int i;
2186 int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ 2184 int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */
2187 2185
2188 if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT)) 2186 BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
2189 BUG();
2190 2187
2191 r->start = r->end = 0; 2188 r->start = r->end = 0;
2192 2189
@@ -2228,8 +2225,7 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r )
2228 int base, size; 2225 int base, size;
2229 int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ 2226 int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */
2230 2227
2231 if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT)) 2228 BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
2232 BUG();
2233 2229
2234 r->start = r->end = 0; 2230 r->start = r->end = 0;
2235 2231
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();