mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 08:31:55 +00:00
Merge branch 'pci/misc'
- Drop of_match_ptr() to avoid unused variables when CONFIG_OF is unset (Bjorn Helgaas) - Fix ARM pci_remap_iospace() when CONFIG_MMU unset to avoid build errors (Pali Rohár) * pci/misc: PCI/ACPI: Update link to PCI firmware specification PCI: Drop of_match_ptr() to avoid unused variables
This commit is contained in:
commit
805f91bc52
@ -1324,7 +1324,7 @@ static struct platform_driver ks_pcie_driver __refdata = {
|
||||
.remove = __exit_p(ks_pcie_remove),
|
||||
.driver = {
|
||||
.name = "keystone-pcie",
|
||||
.of_match_table = of_match_ptr(ks_pcie_of_match),
|
||||
.of_match_table = ks_pcie_of_match,
|
||||
},
|
||||
};
|
||||
builtin_platform_driver(ks_pcie_driver);
|
||||
|
@ -343,7 +343,7 @@ static struct platform_driver armada8k_pcie_driver = {
|
||||
.probe = armada8k_pcie_probe,
|
||||
.driver = {
|
||||
.name = "armada8k-pcie",
|
||||
.of_match_table = of_match_ptr(armada8k_pcie_of_match),
|
||||
.of_match_table = armada8k_pcie_of_match,
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
};
|
||||
|
@ -258,7 +258,7 @@ static struct platform_driver spear13xx_pcie_driver = {
|
||||
.probe = spear13xx_pcie_probe,
|
||||
.driver = {
|
||||
.name = "spear-pcie",
|
||||
.of_match_table = of_match_ptr(spear13xx_pcie_of_match),
|
||||
.of_match_table = spear13xx_pcie_of_match,
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
};
|
||||
|
@ -641,7 +641,7 @@ static const struct of_device_id xgene_pcie_match_table[] = {
|
||||
static struct platform_driver xgene_pcie_driver = {
|
||||
.driver = {
|
||||
.name = "xgene-pcie",
|
||||
.of_match_table = of_match_ptr(xgene_pcie_match_table),
|
||||
.of_match_table = xgene_pcie_match_table,
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
.probe = xgene_pcie_probe,
|
||||
|
@ -21,8 +21,9 @@
|
||||
#include "pci.h"
|
||||
|
||||
/*
|
||||
* The GUID is defined in the PCI Firmware Specification available here:
|
||||
* https://www.pcisig.com/members/downloads/pcifw_r3_1_13Dec10.pdf
|
||||
* The GUID is defined in the PCI Firmware Specification available
|
||||
* here to PCI-SIG members:
|
||||
* https://members.pcisig.com/wg/PCI-SIG/document/15350
|
||||
*/
|
||||
const guid_t pci_acpi_dsm_guid =
|
||||
GUID_INIT(0xe5c937d0, 0x3553, 0x4d7a,
|
||||
|
Loading…
Reference in New Issue
Block a user