diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-15 15:11:10 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-15 15:11:10 -0600 |
| commit | 7c250f8293a362189419ae8b34da111ba02af304 (patch) | |
| tree | b20af84e397b6526f4f7abfb68614ccd77d10cd6 /drivers/pci/controller/pci-host-generic.c | |
| parent | c086b55e374b2c24c2cc506cac6499fee635da06 (diff) | |
| parent | cddadae9748c3c056eb9f0d4b0edfffd0166dd68 (diff) | |
Merge branch 'pci/ecam'
- Unify ECAM constants in native PCI Express drivers (Krzysztof Wilczyński)
- Add thunder-pem constant for custom ".bus_shift" initialiser (Krzysztof
Wilczyński)
- Convert iproc to use new ECAM constants (Krzysztof Wilczyński)
- Change vmd __iomem pointers from "char *" to "void *" (Krzysztof
Wilczyński)
- Remove unused xgene .bus_shift initialisers (Krzysztof Wilczyński)
* pci/ecam:
PCI: xgene: Removed unused ".bus_shift" initialisers from pci-xgene.c
PCI: vmd: Update type of the __iomem pointers
PCI: iproc: Convert to use the new ECAM constants
PCI: thunder-pem: Add constant for custom ".bus_shift" initialiser
PCI: Unify ECAM constants in native PCI Express drivers
Diffstat (limited to 'drivers/pci/controller/pci-host-generic.c')
| -rw-r--r-- | drivers/pci/controller/pci-host-generic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/controller/pci-host-generic.c b/drivers/pci/controller/pci-host-generic.c index b51977abfdf1..63865aeb636b 100644 --- a/drivers/pci/controller/pci-host-generic.c +++ b/drivers/pci/controller/pci-host-generic.c @@ -49,7 +49,6 @@ static void __iomem *pci_dw_ecam_map_bus(struct pci_bus *bus, } static const struct pci_ecam_ops pci_dw_ecam_bus_ops = { - .bus_shift = 20, .pci_ops = { .map_bus = pci_dw_ecam_map_bus, .read = pci_generic_config_read, |