diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:37 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:37 -0500 |
| commit | 5bedfdb2ff8b92e06fe575524f477a9143724f0b (patch) | |
| tree | 00de4fda8cab6edf4b920c350db2ba8cd15ad2b0 /arch/arm/include/asm/mach/pci.h | |
| parent | 299af12a7270f098d714e1625634a453e6846411 (diff) | |
| parent | fc177304d12664ba693d2237a5763ce44bff98e1 (diff) | |
Merge branch 'remotes/lorenzo/pci/arm'
- Remove unused msi_ctrl, io_optional and align_resource fields from ARM
struct hw_pci (Lorenzo Pieralisi)
* remotes/lorenzo/pci/arm:
ARM/PCI: Remove unused fields from struct hw_pci
Diffstat (limited to 'arch/arm/include/asm/mach/pci.h')
| -rw-r--r-- | arch/arm/include/asm/mach/pci.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 83d340702680..ea9bd08895b7 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -17,10 +17,8 @@ struct pci_host_bridge; struct device; struct hw_pci { - struct msi_controller *msi_ctrl; struct pci_ops *ops; int nr_controllers; - unsigned int io_optional:1; void **private_data; int (*setup)(int nr, struct pci_sys_data *); int (*scan)(int nr, struct pci_host_bridge *); @@ -28,11 +26,6 @@ struct hw_pci { void (*postinit)(void); u8 (*swizzle)(struct pci_dev *dev, u8 *pin); int (*map_irq)(const struct pci_dev *dev, u8 slot, u8 pin); - resource_size_t (*align_resource)(struct pci_dev *dev, - const struct resource *res, - resource_size_t start, - resource_size_t size, - resource_size_t align); }; /* |