PCI: Drop of_match_ptr() to avoid unused variables

We have stubs for most OF interfaces even when CONFIG_OF is not set, so we
allow building of most controller drivers in that case for compile testing.

When CONFIG_OF is not set, "of_match_ptr(<match_table>)" compiles to NULL,
which leaves <match_table> unused, resulting in errors like this:

  $ make W=1
  drivers/pci/controller/pci-xgene.c:636:34: error: ‘xgene_pcie_match_table’ defined but not used [-Werror=unused-const-variable=]

Drop of_match_ptr() to avoid the unused variable warning.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index d10e5fd0f83c8e683e6c5cdc0cf7ff6cac81211f..602909f712b95b9375663c233aab71491a51dca7 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -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);

diff --git a/drivers/pci/controller/dwc/pcie-armada8k.c b/drivers/pci/controller/dwc/pcie-armada8k.c
index 4e2552dcf982775e4c5d2c1c39b4003bce4a5460..8391417fad414f18e668e6672d8673d9d4ceacca 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-armada8k.c
+++ b/drivers/pci/controller/dwc/pcie-armada8k.c
@@ -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,
        },
 };

diff --git a/drivers/pci/controller/dwc/pcie-spear13xx.c b/drivers/pci/controller/dwc/pcie-spear13xx.c
index 1569e82b5568b86a6782228bd07a27d7baf61fa0..48af5170a8e79d8625a466538cdb114d4ecd763a 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-spear13xx.c
+++ b/drivers/pci/controller/dwc/pcie-spear13xx.c
@@ -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,
        },
 };

diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index eb6240958bb027f4d7c86d61ef6e589a92c3ed24..549d3bd6d1c27c8869ca1e41eab5f3400ad3fdce 100644 (file)
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -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,