Merge branch 'pci/mjg-pci-roms-from-efi' into next

* pci/mjg-pci-roms-from-efi:
  PCI: Use phys_addr_t for physical ROM address

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 6a6b01778dab..1b1dda90a945 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 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)
          */
         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 ea41a0a52a59..d11cc6e79994 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 */
 };