summaryrefslogtreecommitdiff
path: root/drivers/pci/of.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2023-04-21 00:16:32 +0300
committerBjorn Helgaas <bhelgaas@google.com>2023-04-21 00:16:32 +0300
commit66d3d0d0e860f06ec40304e792c2270e70617008 (patch)
tree4e42de809526b5d2c0be2fd0e0f8508f1048d788 /drivers/pci/of.c
parent90d66d4d86aee7a6a429081c9d95e663463ab436 (diff)
parent9195ee1a1f76033eccb424b97ee647625b7af096 (diff)
downloadlinux-66d3d0d0e860f06ec40304e792c2270e70617008.tar.xz
Merge branch 'pci/enumeration'
- Use of_property_present(), instead of lower-level functions like of_get_property(), for testing DT property presence (Rob Herring) * pci/enumeration: PCI: Use of_property_present() for testing DT property presence
Diffstat (limited to 'drivers/pci/of.c')
-rw-r--r--drivers/pci/of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 196834ed44fe..e085f2eca372 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -447,7 +447,7 @@ static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *
return -ENODEV;
/* Local interrupt-map in the device node? Use it! */
- if (of_get_property(dn, "interrupt-map", NULL)) {
+ if (of_property_present(dn, "interrupt-map")) {
pin = pci_swizzle_interrupt_pin(pdev, pin);
ppnode = dn;
}