diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 23:16:21 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 23:16:21 +0100 |
| commit | 73c82469bd88ce1c9a4403f34582e544e77f4854 (patch) | |
| tree | 7a2f0aed1983981c6f07d32280ca5204f5473db3 /drivers/pci/setup-bus.c | |
| parent | Merge branch 'pci/hotplug' (diff) | |
| parent | x86/PCI: Add #includes to asm/pci_x86.h (diff) | |
| download | linux-73c82469bd88ce1c9a4403f34582e544e77f4854.tar.xz linux-73c82469bd88ce1c9a4403f34582e544e77f4854.zip | |
Merge branch 'pci/misc'
- Update the aer-inject URL (Yicong Yang)
- Declare pci_filp_private only when HAVE_PCI_MMAP to avoid unused struct
definition (Krzysztof Wilczyński)
- Remove unused assignments (Bjorn Helgaas)
- Add #includes to asm/pci_x86.h to prevent build errors (Randy Dunlap)
* pci/misc:
x86/PCI: Add #includes to asm/pci_x86.h
PCI: ibmphp: Remove unused assignments
PCI: cpqphp: Remove unused assignments
PCI: fu740: Remove unused assignments
PCI: kirin: Remove unused assignments
PCI: Remove unused assignments
PCI: Declare pci_filp_private only when HAVE_PCI_MMAP
PCI/AER: Update aer-inject URL
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index a7893bf2f580..8cb68e6f6ef9 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1525,7 +1525,7 @@ static void pci_bridge_release_resources(struct pci_bus *bus, { struct pci_dev *dev = bus->self; struct resource *r; - unsigned int old_flags = 0; + unsigned int old_flags; struct resource *b_res; int idx = 1; |