Commit 8610e98f 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.

See also 1dff012f ("PCI: Drop of_match_ptr() to avoid unused
variables").

Link: https://lore.kernel.org/r/20221025191339.667614-2-helgaas@kernel.org
Link: https://lore.kernel.org/r/20221116205100.1136224-2-helgaas@kernel.org


Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 277004d7

drivers/pci/controller/pci-ftpci100.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static const struct of_device_id faraday_pci_of_match[] = { 
static struct platform_driver faraday_pci_driver = {

	.driver = {

		.name = "ftpci100",

		.of_match_table = of_match_ptr(faraday_pci_of_match),

		.of_match_table = faraday_pci_of_match,

		.suppress_bind_attrs = true,

	},

	.probe  = faraday_pci_probe,

drivers/pci/controller/pci-v3-semi.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static const struct of_device_id v3_pci_of_match[] = { 
static struct platform_driver v3_pci_driver = {

	.driver = {

		.name = "pci-v3-semi",

		.of_match_table = of_match_ptr(v3_pci_of_match),

		.of_match_table = v3_pci_of_match,

		.suppress_bind_attrs = true,

	},

	.probe  = v3_pci_probe,