From c4ddbff70621449606fa3f0a1ad8277fac0f5aeb Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Mon, 9 Feb 2009 17:52:54 +0000 Subject: Remove some warnings, mainly from format strings which didn't match the arguments. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3931 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/devices/device_util.c | 2 +- src/devices/pci_device.c | 8 ++++---- src/devices/pci_rom.c | 6 +++--- src/devices/pnp_device.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/devices') diff --git a/src/devices/device_util.c b/src/devices/device_util.c index 5a1b8b5ef0..c18385073c 100644 --- a/src/devices/device_util.c +++ b/src/devices/device_util.c @@ -467,7 +467,7 @@ void report_resource_stored(device_t dev, struct resource *resource, const char #endif } printk_debug( - "%s %02x <- [0x%010Lx - 0x%010Lx] size 0x%08Lx gran 0x%02x %s%s%s\n", + "%s %02lx <- [0x%010Lx - 0x%010Lx] size 0x%08Lx gran 0x%02x %s%s%s\n", dev_path(dev), resource->index, base, end, diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index fcf9730981..396d4f3a31 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -207,7 +207,7 @@ struct resource *pci_get_resource(struct device *dev, unsigned long index) if (moving == 0) { if (value != 0) { printk_debug( - "%s register %02x(%08x), read-only ignoring it\n", + "%s register %02lx(%08lx), read-only ignoring it\n", dev_path(dev), index, value); } resource->flags = 0; @@ -311,7 +311,7 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) if (moving == 0) { if (value != 0) { - printk_debug("%s register %02x(%08x), read-only ignoring it\n", + printk_debug("%s register %02lx(%08lx), read-only ignoring it\n", dev_path(dev), index, value); } resource->flags = 0; @@ -459,7 +459,7 @@ static void pci_set_resource(struct device *dev, struct resource *resource) /* Make certain the resource has actually been set */ if (!(resource->flags & IORESOURCE_ASSIGNED)) { - printk_err("ERROR: %s %02x %s size: 0x%010Lx not assigned\n", + printk_err("ERROR: %s %02lx %s size: 0x%010Lx not assigned\n", dev_path(dev), resource->index, resource_type(resource), resource->size); @@ -546,7 +546,7 @@ static void pci_set_resource(struct device *dev, struct resource *resource) else { /* Don't let me think I stored the resource */ resource->flags &= ~IORESOURCE_STORED; - printk_err("ERROR: invalid resource->index %x\n", + printk_err("ERROR: invalid resource->index %lx\n", resource->index); } report_resource_stored(dev, resource, ""); diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index 1b7e4bffa8..1d1024c9da 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -45,7 +45,7 @@ struct rom_header * pci_rom_probe(struct device *dev) return NULL; } - printk_debug("rom address for %s = %x\n", dev_path(dev), rom_address); + printk_debug("rom address for %s = %lx\n", dev_path(dev), rom_address); if(!dev->on_mainboard) { /* enable expansion ROM address decoding */ @@ -110,12 +110,12 @@ struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_heade extern device_t vga_pri; // the primary vga device, defined in device.c if (dev != vga_pri) return NULL; // only one VGA supported #endif - printk_debug("copying VGA ROM Image from 0x%x to 0x%x, 0x%x bytes\n", + printk_debug("copying VGA ROM Image from %p to 0x%x, 0x%x bytes\n", rom_header, PCI_VGA_RAM_IMAGE_START, rom_size); memcpy((void *)PCI_VGA_RAM_IMAGE_START, rom_header, rom_size); return (struct rom_header *) (PCI_VGA_RAM_IMAGE_START); } else { - printk_debug("copying non-VGA ROM Image from 0x%x to 0x%x, 0x%x bytes\n", + printk_debug("copying non-VGA ROM Image from %p to %p, 0x%x bytes\n", rom_header, pci_ram_image_start, rom_size); memcpy(pci_ram_image_start, rom_header, rom_size); pci_ram_image_start += rom_size; diff --git a/src/devices/pnp_device.c b/src/devices/pnp_device.c index 5740a8044a..8b5acecfcf 100644 --- a/src/devices/pnp_device.c +++ b/src/devices/pnp_device.c @@ -103,7 +103,7 @@ void pnp_read_resources(device_t dev) static void pnp_set_resource(device_t dev, struct resource *resource) { if (!(resource->flags & IORESOURCE_ASSIGNED)) { - printk_err("ERROR: %s %02x %s size: 0x%010Lx not assigned\n", + printk_err("ERROR: %s %02lx %s size: 0x%010Lx not assigned\n", dev_path(dev), resource->index, resource_type(resource), resource->size); @@ -121,7 +121,7 @@ static void pnp_set_resource(device_t dev, struct resource *resource) pnp_set_irq(dev, resource->index, resource->base); } else { - printk_err("ERROR: %s %02x unknown resource type\n", + printk_err("ERROR: %s %02lx unknown resource type\n", dev_path(dev), resource->index); return; } -- cgit v1.2.3