diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-04-02 22:26:38 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-04-02 22:26:38 +0300 |
| commit | 10e8141baa7c5585c2d1ad98397186689ccf99b3 (patch) | |
| tree | 043dfcc9edab6cebd69fc44c55a1a60a8d4be141 /drivers/pci/pci-acpi.c | |
| parent | 74f0862cc9836460282b54b8350c8947cc8220b6 (diff) | |
| parent | bd641fd8303a371e789e924291086268256766b0 (diff) | |
| download | linux-10e8141baa7c5585c2d1ad98397186689ccf99b3.tar.xz | |
Merge branch 'pci/misc'
- Move _HPX type array from stack to static data (Colin Ian King)
- Avoid an ASMedia XHCI USB PME# defect; apparently it doesn't assert
PME# when USB3.0 devices are hotplugged in D0 (Kai-Heng Feng)
- Revert sysfs "rescan" file renames that broke an application (Kelsey
Skunberg)
* pci/misc:
PCI: sysfs: Revert "rescan" file renames
PCI: Avoid ASMedia XHCI USB PME# from D0 defect
PCI/ACPI: Move pcie_to_hpx3_type[] from stack to static data
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 1a6d2062cf8d..d21969fba6ab 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -439,7 +439,7 @@ enum hpx_type3_dev_type { static u16 hpx3_device_type(struct pci_dev *dev) { u16 pcie_type = pci_pcie_type(dev); - const int pcie_to_hpx3_type[] = { + static const int pcie_to_hpx3_type[] = { [PCI_EXP_TYPE_ENDPOINT] = HPX_TYPE_ENDPOINT, [PCI_EXP_TYPE_LEG_END] = HPX_TYPE_LEG_END, [PCI_EXP_TYPE_RC_END] = HPX_TYPE_RC_END, |