diff options
| author |   Stoyan Gaydarov <stoyboyker@gmail.com> | 2009-03-10 00:10:30 -0500 |
|---|---|---|
| committer |   Tony Luck <tony.luck@intel.com> | 2009-04-01 09:50:48 -0700 |
| commit | 80a03e29164c76b70e6dbb1d10515820cc24487a (patch) | |
| tree | ee9426ae7b76777169079e7120a8413384f128b6 /arch/ia64/sn/kernel/io_init.c | |
| parent | [IA64] Fix typo/thinko in arch/ia64/sn/kernel/sn2/sn2_smp.c (diff) | |
| download | linux-dev-80a03e29164c76b70e6dbb1d10515820cc24487a.tar.xz linux-dev-80a03e29164c76b70e6dbb1d10515820cc24487a.zip | |
[IA64] BUG to BUG_ON changes
Replace:
if (test)
BUG();
with
BUG_ON(test);
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/io_init.c')
| -rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index e2eb2da60f96..ee774c366a06 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -128,8 +128,7 @@ sn_legacy_pci_window_fixup(struct pci_controller *controller, { controller->window = kcalloc(2, sizeof(struct pci_window), GFP_KERNEL); - if (controller->window == NULL) - BUG(); + BUG_ON(controller->window == NULL); controller->window[0].offset = legacy_io; controller->window[0].resource.name = "legacy_io"; controller->window[0].resource.flags = IORESOURCE_IO; @@ -168,8 +167,7 @@ sn_pci_window_fixup(struct pci_dev *dev, unsigned int count, idx = controller->windows; new_count = controller->windows + count; new_window = kcalloc(new_count, sizeof(struct pci_window), GFP_KERNEL); - if (new_window == NULL) - BUG(); + BUG_ON(new_window == NULL); if (controller->window) { memcpy(new_window, controller->window, sizeof(struct pci_window) * controller->windows); @@ -222,8 +220,7 @@ sn_io_slot_fixup(struct pci_dev *dev) (u64) __pa(pcidev_info), (u64) __pa(sn_irq_info)); - if (status) - BUG(); /* Cannot get platform pci device information */ + BUG_ON(status); /* Cannot get platform pci device information */ /* Copy over PIO Mapped Addresses */ @@ -307,8 +304,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) prom_bussoft_ptr = __va(prom_bussoft_ptr); controller = kzalloc(sizeof(*controller), GFP_KERNEL); - if (!controller) - BUG(); + BUG_ON(!controller); controller->segment = segment; /* |