OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Bjorn Helgaas 2012-12-10 11:24:42 -07:00
parent f9a37be0f0
commit dbd3fc3345
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/pci/common.c
View File

@ -628,8 +628,8 @@ int pcibios_add_device(struct pci_dev *dev)
(PCI_FUNC(dev->devfn) == rom->function) && (PCI_FUNC(dev->devfn) == rom->function) &&
(dev->vendor == rom->vendor) && (dev->vendor == rom->vendor) &&
(dev->device == rom->devid)) { (dev->device == rom->devid)) {
dev->rom = (void *)(unsigned long)(pa_data + dev->rom = pa_data +
offsetof(struct pci_setup_rom, romdata)); offsetof(struct pci_setup_rom, romdata);
dev->romlen = rom->pcilen; dev->romlen = rom->pcilen;
} }
} }

2
drivers/pci/rom.c
View File

@ -122,7 +122,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
*/ */
if (pdev->rom && pdev->romlen) { if (pdev->rom && pdev->romlen) {
*size = 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 * 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 * memory map if the VGA enable bit of the Bridge Control register is

2
include/linux/pci.h
View File

@ -333,7 +333,7 @@ struct pci_dev {
}; };
struct pci_ats *ats; /* Address Translation Service */ struct pci_ats *ats; /* Address Translation Service */
#endif #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 */ size_t romlen; /* Length of ROM if it's not from the BAR */
}; };