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:
Родитель
f9a37be0f0
Коммит
dbd3fc3345
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче