summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-12-10 11:24:42 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-12-10 11:24:42 -0700
commitdbd3fc3345390a989a033427aa915a0dfb62149f (patch)
treeec8c03902652acc7d298a0bd51517d853fb86cde
parentf9a37be0f02a943d63e3346b19f9c9d8d91826cb (diff)
downloadlinux-3.10-dbd3fc3345390a989a033427aa915a0dfb62149f.tar.gz
linux-3.10-dbd3fc3345390a989a033427aa915a0dfb62149f.tar.bz2
linux-3.10-dbd3fc3345390a989a033427aa915a0dfb62149f.zip
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>
-rw-r--r--arch/x86/pci/common.c4
-rw-r--r--drivers/pci/rom.c2
-rw-r--r--include/linux/pci.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index fddb9f66cc4..d07f3bbca5a 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -628,8 +628,8 @@ int pcibios_add_device(struct pci_dev *dev)
(PCI_FUNC(dev->devfn) == rom->function) &&
(dev->vendor == rom->vendor) &&
(dev->device == rom->devid)) {
- dev->rom = (void *)(unsigned long)(pa_data +
- offsetof(struct pci_setup_rom, romdata));
+ dev->rom = pa_data +
+ offsetof(struct pci_setup_rom, romdata);
dev->romlen = rom->pcilen;
}
}
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 3a3828fbc87..ab886b7ee32 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)
*/
if (pdev->rom && pdev->romlen) {
*size = pdev->romlen;
- return phys_to_virt((phys_addr_t)pdev->rom);
+ return phys_to_virt(pdev->rom);
/*
* IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy
* memory map if the VGA enable bit of the Bridge Control register is
diff --git a/include/linux/pci.h b/include/linux/pci.h
index f116b2d859d..957563b7a5e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -333,7 +333,7 @@ struct pci_dev {
};
struct pci_ats *ats; /* Address Translation Service */
#endif
- void *rom; /* Physical pointer to ROM if it's not from the BAR */
+ phys_addr_t rom; /* Physical address of ROM if it's not from the BAR */
size_t romlen; /* Length of ROM if it's not from the BAR */
};