summaryrefslogtreecommitdiff
path: root/src/devices
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-06-05 11:41:51 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-06-05 11:41:51 +0000
commit87e7050bff564820e3337c0653211a8180ef1fc0 (patch)
tree530f5a9db56d7579fbb3a61806adc709305982e0 /src/devices
parent28d71b9445ef2774baa5e1f5ad17160d90b0e8bb (diff)
downloadcoreboot-87e7050bff564820e3337c0653211a8180ef1fc0.tar.xz
die() does never return. Annotate it as such.
Any endless loop after die() can be eliminated. Dereferencing a NULL pointer is bad. die() instead. Replace endless loops with die(). Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4340 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/pci_ops.c5
-rw-r--r--src/devices/smbus_ops.c1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/devices/pci_ops.c b/src/devices/pci_ops.c
index 08792f209d..ed984f89bd 100644
--- a/src/devices/pci_ops.c
+++ b/src/devices/pci_ops.c
@@ -30,7 +30,7 @@ static struct bus *get_pbus(device_t dev)
struct bus *pbus;
if (!dev)
- printk_alert("get_pbus: dev is NULL!\n");
+ die("get_pbus: dev is NULL!\n");
pbus = dev->bus;
@@ -44,9 +44,8 @@ static struct bus *get_pbus(device_t dev)
pbus = pbus->dev->bus;
}
if (!pbus || !pbus->dev || !pbus->dev->ops || !pbus->dev->ops->ops_pci_bus) {
- printk_alert("%s Cannot find pci bus operations", dev_path(dev));
+ printk_emerg("%s Cannot find pci bus operations\n", dev_path(dev));
die("");
- for(;;);
}
return pbus;
}
diff --git a/src/devices/smbus_ops.c b/src/devices/smbus_ops.c
index c66dbe62bb..acf0b1f39d 100644
--- a/src/devices/smbus_ops.c
+++ b/src/devices/smbus_ops.c
@@ -34,7 +34,6 @@ struct bus *get_pbus_smbus(device_t dev)
if (!pbus || !pbus->dev || !pbus->dev->ops || !pbus->dev->ops->ops_smbus_bus) {
printk_alert("%s Cannot find smbus bus operations", dev_path(dev));
die("");
- for(;;);
}
return pbus;
}