Take care of NULL chip_ops->name
Change-Id: Ic44915cdb07e0d87962eff0744acefce2a4845a2 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/1626 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-by: Peter Stuge <peter@stuge.se>
This commit is contained in:
parent
0524e4b53e
commit
7baadac403
|
@ -278,8 +278,7 @@ static int smbios_walk_device_tree(device_t tree, int *handle, unsigned long *cu
|
|||
int len = 0;
|
||||
|
||||
for(dev = tree; dev; dev = dev->next) {
|
||||
printk(BIOS_INFO, "%s (%s)\n", dev_path(dev),
|
||||
(dev->chip_ops && dev->chip_ops->name) ? dev->chip_ops->name : "");
|
||||
printk(BIOS_INFO, "%s (%s)\n", dev_path(dev), dev_name(dev));
|
||||
|
||||
if (dev->ops && dev->ops->get_smbios_data)
|
||||
len += dev->ops->get_smbios_data(dev, handle, current);
|
||||
|
|
|
@ -228,6 +228,14 @@ const char *dev_path(device_t dev)
|
|||
return buffer;
|
||||
}
|
||||
|
||||
const char *dev_name(device_t dev)
|
||||
{
|
||||
if (dev->chip_ops && dev->chip_ops->name)
|
||||
return dev->chip_ops->name;
|
||||
else
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
const char *bus_path(struct bus *bus)
|
||||
{
|
||||
static char buffer[BUS_PATH_MAX];
|
||||
|
|
|
@ -237,12 +237,7 @@ static void debug_init(device_t dev)
|
|||
switch(dev->path.pnp.device) {
|
||||
case 0:
|
||||
parent = dev->bus->dev;
|
||||
printk(BIOS_DEBUG, "DEBUG: %s", dev_path(parent));
|
||||
if(parent->chip_ops && parent->chip_ops->name) {
|
||||
printk(BIOS_DEBUG, ": %s\n", parent->chip_ops->name);
|
||||
} else {
|
||||
printk(BIOS_DEBUG, "\n");
|
||||
}
|
||||
printk(BIOS_DEBUG, "DEBUG: %s : %s\n", dev_path(parent), dev_name(parent));
|
||||
break;
|
||||
|
||||
case 1:
|
||||
|
|
|
@ -137,6 +137,7 @@ unsigned int scan_bus(struct device *bus, unsigned int max);
|
|||
void assign_resources(struct bus *bus);
|
||||
void enumerate_static_device(void);
|
||||
void enumerate_static_devices(void);
|
||||
const char *dev_name(device_t dev);
|
||||
const char *dev_path(device_t dev);
|
||||
const char *bus_path(struct bus *bus);
|
||||
void dev_set_enabled(device_t dev, int enable);
|
||||
|
|
|
@ -676,7 +676,7 @@ static void update_subsystemid( device_t dev )
|
|||
} else {
|
||||
dev->subsystem_device = 0x4077; // U1P0 = 0x4077
|
||||
}
|
||||
printk(BIOS_INFO, "%s [%x/%x]\n", dev->chip_ops->name, dev->subsystem_vendor, dev->subsystem_device );
|
||||
printk(BIOS_INFO, "%s [%x/%x]\n", dev_name(dev), dev->subsystem_vendor, dev->subsystem_device );
|
||||
for( i=0; slot[i].bus < 255; i++) {
|
||||
device_t d;
|
||||
d = dev_find_slot(slot[i].bus,slot[i].devfn);
|
||||
|
@ -812,7 +812,7 @@ static void init(device_t dev)
|
|||
#endif
|
||||
|
||||
printk(BIOS_DEBUG, "%s %s[%x/%x] %s\n",
|
||||
dev->chip_ops->name, dev_path(dev), dev->subsystem_vendor, dev->subsystem_device, __func__);
|
||||
dev_name(dev), dev_path(dev), dev->subsystem_vendor, dev->subsystem_device, __func__);
|
||||
|
||||
#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL
|
||||
if( get_option(&int15_func.regs.func00_LCD_panel_id, "lcd_panel_id") < 0 )
|
||||
|
@ -835,7 +835,7 @@ static void enable_dev(device_t dev)
|
|||
{
|
||||
|
||||
printk(BIOS_INFO, "%s %s[%x/%x] %s\n",
|
||||
dev->chip_ops->name, dev_path(dev), dev->subsystem_vendor, dev->subsystem_device, __func__);
|
||||
dev_name(dev), dev_path(dev), dev->subsystem_vendor, dev->subsystem_device, __func__);
|
||||
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
|
||||
/* Install custom int15 handler for VGA OPROM */
|
||||
mainboard_interrupt_handlers(0x15, &int15_handler);
|
||||
|
|
Loading…
Reference in New Issue