From 16cdbb244cded6f3d8df719b7a0217fdf6bf327d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 21 Apr 2009 20:14:31 +0000 Subject: Eliminate various issues brought up by scan-build. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4152 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/boot/coreboot_table.c | 3 +-- src/boot/elfboot.c | 3 --- src/console/usbdebug_direct_console.c | 1 + src/devices/pci_device.c | 9 ++++----- src/devices/pci_rom.c | 2 +- src/include/console/console.h | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c index aa665c2520..88605cd0d1 100644 --- a/src/arch/i386/boot/coreboot_table.c +++ b/src/arch/i386/boot/coreboot_table.c @@ -93,9 +93,8 @@ struct lb_serial *lb_serial(struct lb_header *header) void add_console(struct lb_header *header, u16 consoletype) { - struct lb_record *rec; struct lb_console *console; - rec = lb_new_record(header); + console = (struct lb_console *)lb_new_record(header); console->tag = LB_TAG_CONSOLE; console->size = sizeof(*console); diff --git a/src/boot/elfboot.c b/src/boot/elfboot.c index ed15e96fe7..acffb634da 100644 --- a/src/boot/elfboot.c +++ b/src/boot/elfboot.c @@ -362,9 +362,6 @@ static void relocate_segment(unsigned long buffer, struct segment *seg) seg->phdr_next->phdr_prev = new; seg->phdr_next = new; - /* compute the new value of end */ - end = start + len; - printk_spew(" late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_addr, new->s_addr + new->s_filesz, diff --git a/src/console/usbdebug_direct_console.c b/src/console/usbdebug_direct_console.c index 18fe6dcb37..86b89bd920 100644 --- a/src/console/usbdebug_direct_console.c +++ b/src/console/usbdebug_direct_console.c @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index 0e7a5df487..c816ae0b2c 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -10,7 +10,8 @@ * Copyright (C) 2004-2005 Li-Ta Lo * Copyright (C) 2005-2006 Tyan * (Written by Yinghai Lu for Tyan) - * Copyright (C) 2005-2007 Stefan Reinauer + * Copyright (C) 2005-2009 coresystems GmbH + * (Written by Stefan Reinauer for coresystems GmbH) */ /* @@ -271,7 +272,7 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) { struct resource *resource; unsigned long value; - resource_t moving, limit; + resource_t moving; if ((dev->on_mainboard) && (dev->rom_address == 0)) { //skip it if rom_address is not set in MB Config.lb @@ -296,8 +297,6 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) * - Limit is all of the bits that move plus all of the lower bits. * See PCI Spec 6.2.5.1 ... */ - limit = 0; - if (moving) { resource->size = 1; resource->align = resource->gran = 0; @@ -306,7 +305,7 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) resource->align += 1; resource->gran += 1; } - resource->limit = limit = moving | (resource->size - 1); + resource->limit = moving | (resource->size - 1); } if (moving == 0) { diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index 5df13a4214..e628161cf6 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -42,7 +42,7 @@ struct rom_header * pci_rom_probe(struct device *dev) printk_debug("In cbfs, rom address for %s = %lx\n", dev_path(dev), rom_address); if (v) { - dev->rom_address = v; + dev->rom_address = (u32)v; dev->on_mainboard = 1; } } diff --git a/src/include/console/console.h b/src/include/console/console.h index 3e1607b2a7..cea174c34e 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -10,7 +10,7 @@ void console_tx_flush(void); unsigned char console_rx_byte(void); int console_tst_byte(void); void post_code(uint8_t value); -void die(const char *msg); +void __attribute__ ((noreturn)) die(const char *msg); struct console_driver { void (*init)(void); -- cgit v1.2.3