diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-10 11:24:42 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-10 11:24:42 -0700 |
| commit | dbd3fc3345390a989a033427aa915a0dfb62149f (patch) | |
| tree | ec8c03902652acc7d298a0bd51517d853fb86cde /arch/x86/pci/common.c | |
| parent | f9a37be0f02a943d63e3346b19f9c9d8d91826cb (diff) | |
| download | op-kernel-dev-dbd3fc3345390a989a033427aa915a0dfb62149f.zip op-kernel-dev-dbd3fc3345390a989a033427aa915a0dfb62149f.tar.gz | |
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 'arch/x86/pci/common.c')
| -rw-r--r-- | arch/x86/pci/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index fddb9f6..d07f3bb 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; } } |
