aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/rom.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-12-10 13:24:42 -0500
committerBjorn Helgaas <bhelgaas@google.com>2012-12-10 13:24:42 -0500
commitdbd3fc3345390a989a033427aa915a0dfb62149f (patch)
treeec8c03902652acc7d298a0bd51517d853fb86cde /drivers/pci/rom.c
parentf9a37be0f02a943d63e3346b19f9c9d8d91826cb (diff)
PCI: Use phys_addr_t for physical ROM address
Use phys_addr_t rather than "void *" for physical memory address. This removes casts and fixes a "cast from pointer to integer of different size" warning on ppc44x_defconfig. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/rom.c')
-rw-r--r--drivers/pci/rom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 3a3828fbc879..ab886b7ee327 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -122,7 +122,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
122 */ 122 */
123 if (pdev->rom && pdev->romlen) { 123 if (pdev->rom && pdev->romlen) {
124 *size = pdev->romlen; 124 *size = pdev->romlen;
125 return phys_to_virt((phys_addr_t)pdev->rom); 125 return phys_to_virt(pdev->rom);
126 /* 126 /*
127 * IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy 127 * IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy
128 * memory map if the VGA enable bit of the Bridge Control register is 128 * memory map if the VGA enable bit of the Bridge Control register is