summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/device/pci_device.c22
-rw-r--r--src/device/pci_rom.c8
2 files changed, 15 insertions, 15 deletions
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 865158644c77..9de294698af3 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -108,7 +108,7 @@ struct resource *pci_get_resource(struct device *dev, unsigned long index)
PCI_BASE_ADDRESS_MEM_LIMIT_64)) {
/* Find the high bits that move. */
moving |=
- ((resource_t) pci_moving_config32(dev, index + 4)) << 32;
+ ((resource_t)pci_moving_config32(dev, index + 4)) << 32;
}
/* Find the resource constraints.
@@ -496,13 +496,13 @@ static void pci_bridge_read_bases(struct device *dev)
resource_t moving_base, moving_limit, moving;
/* See if the bridge I/O resources are implemented. */
- moving_base = ((u32) pci_moving_config8(dev, PCI_IO_BASE)) << 8;
+ moving_base = ((u32)pci_moving_config8(dev, PCI_IO_BASE)) << 8;
moving_base |=
- ((u32) pci_moving_config16(dev, PCI_IO_BASE_UPPER16)) << 16;
+ ((u32)pci_moving_config16(dev, PCI_IO_BASE_UPPER16)) << 16;
- moving_limit = ((u32) pci_moving_config8(dev, PCI_IO_LIMIT)) << 8;
+ moving_limit = ((u32)pci_moving_config8(dev, PCI_IO_LIMIT)) << 8;
moving_limit |=
- ((u32) pci_moving_config16(dev, PCI_IO_LIMIT_UPPER16)) << 16;
+ ((u32)pci_moving_config16(dev, PCI_IO_LIMIT_UPPER16)) << 16;
moving = moving_base & moving_limit;
@@ -511,14 +511,14 @@ static void pci_bridge_read_bases(struct device *dev)
/* See if the bridge prefmem resources are implemented. */
moving_base =
- ((resource_t) pci_moving_config16(dev, PCI_PREF_MEMORY_BASE)) << 16;
+ ((resource_t)pci_moving_config16(dev, PCI_PREF_MEMORY_BASE)) << 16;
moving_base |=
- ((resource_t) pci_moving_config32(dev, PCI_PREF_BASE_UPPER32)) << 32;
+ ((resource_t)pci_moving_config32(dev, PCI_PREF_BASE_UPPER32)) << 32;
moving_limit =
- ((resource_t) pci_moving_config16(dev, PCI_PREF_MEMORY_LIMIT)) << 16;
+ ((resource_t)pci_moving_config16(dev, PCI_PREF_MEMORY_LIMIT)) << 16;
moving_limit |=
- ((resource_t) pci_moving_config32(dev, PCI_PREF_LIMIT_UPPER32)) << 32;
+ ((resource_t)pci_moving_config32(dev, PCI_PREF_LIMIT_UPPER32)) << 32;
moving = moving_base & moving_limit;
/* Initialize the prefetchable memory constraints on the current bus. */
@@ -526,8 +526,8 @@ static void pci_bridge_read_bases(struct device *dev)
IORESOURCE_MEM | IORESOURCE_PREFETCH);
/* See if the bridge mem resources are implemented. */
- moving_base = ((u32) pci_moving_config16(dev, PCI_MEMORY_BASE)) << 16;
- moving_limit = ((u32) pci_moving_config16(dev, PCI_MEMORY_LIMIT)) << 16;
+ moving_base = ((u32)pci_moving_config16(dev, PCI_MEMORY_BASE)) << 16;
+ moving_limit = ((u32)pci_moving_config16(dev, PCI_MEMORY_LIMIT)) << 16;
moving = moving_base & moving_limit;
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index b8dafd1bdd06..848062605631 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -159,10 +159,10 @@ struct rom_header *pci_rom_load(struct device *dev,
do {
/* Get next image. */
- rom_header = (struct rom_header *)((void *) rom_header
+ rom_header = (struct rom_header *)((void *)rom_header
+ image_size);
- rom_data = (struct pci_data *)((void *) rom_header
+ rom_data = (struct pci_data *)((void *)rom_header
+ le32_to_cpu(rom_header->data));
image_size = le32_to_cpu(rom_data->ilen) * 512;
@@ -190,7 +190,7 @@ struct rom_header *pci_rom_load(struct device *dev,
memcpy((void *)PCI_VGA_RAM_IMAGE_START, rom_header,
rom_size);
}
- return (struct rom_header *) (PCI_VGA_RAM_IMAGE_START);
+ return (struct rom_header *)(PCI_VGA_RAM_IMAGE_START);
}
printk(BIOS_DEBUG, "Copying non-VGA ROM image from %p to %p, 0x%x bytes\n",
@@ -198,7 +198,7 @@ struct rom_header *pci_rom_load(struct device *dev,
memcpy(pci_ram_image_start, rom_header, rom_size);
pci_ram_image_start += rom_size;
- return (struct rom_header *) (pci_ram_image_start-rom_size);
+ return (struct rom_header *)(pci_ram_image_start-rom_size);
}
/* ACPI */