Commit 1dff012f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f2906aa8

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

	},

};

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

	},

};

drivers/pci/controller/pci-xgene.c

+1 −1
Original line number Diff line number Diff line
@@ -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,