Skip to content

Commit 805f91b

Browse files
committed
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
2 parents ed89d69 + 6943f3e commit 805f91b

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

drivers/pci/controller/dwc/pci-keystone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,7 @@ static struct platform_driver ks_pcie_driver __refdata = {
13241324
.remove = __exit_p(ks_pcie_remove),
13251325
.driver = {
13261326
.name = "keystone-pcie",
1327-
.of_match_table = of_match_ptr(ks_pcie_of_match),
1327+
.of_match_table = ks_pcie_of_match,
13281328
},
13291329
};
13301330
builtin_platform_driver(ks_pcie_driver);

drivers/pci/controller/dwc/pcie-armada8k.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static struct platform_driver armada8k_pcie_driver = {
343343
.probe = armada8k_pcie_probe,
344344
.driver = {
345345
.name = "armada8k-pcie",
346-
.of_match_table = of_match_ptr(armada8k_pcie_of_match),
346+
.of_match_table = armada8k_pcie_of_match,
347347
.suppress_bind_attrs = true,
348348
},
349349
};

drivers/pci/controller/dwc/pcie-spear13xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ static struct platform_driver spear13xx_pcie_driver = {
258258
.probe = spear13xx_pcie_probe,
259259
.driver = {
260260
.name = "spear-pcie",
261-
.of_match_table = of_match_ptr(spear13xx_pcie_of_match),
261+
.of_match_table = spear13xx_pcie_of_match,
262262
.suppress_bind_attrs = true,
263263
},
264264
};

drivers/pci/controller/pci-xgene.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static const struct of_device_id xgene_pcie_match_table[] = {
641641
static struct platform_driver xgene_pcie_driver = {
642642
.driver = {
643643
.name = "xgene-pcie",
644-
.of_match_table = of_match_ptr(xgene_pcie_match_table),
644+
.of_match_table = xgene_pcie_match_table,
645645
.suppress_bind_attrs = true,
646646
},
647647
.probe = xgene_pcie_probe,

drivers/pci/pci-acpi.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
#include "pci.h"
2222

2323
/*
24-
* The GUID is defined in the PCI Firmware Specification available here:
25-
* https://www.pcisig.com/members/downloads/pcifw_r3_1_13Dec10.pdf
24+
* The GUID is defined in the PCI Firmware Specification available
25+
* here to PCI-SIG members:
26+
* https://members.pcisig.com/wg/PCI-SIG/document/15350
2627
*/
2728
const guid_t pci_acpi_dsm_guid =
2829
GUID_INIT(0xe5c937d0, 0x3553, 0x4d7a,

0 commit comments

Comments
 (0)