diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2023-04-21 00:16:32 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-04-21 00:16:32 +0300 |
| commit | 66d3d0d0e860f06ec40304e792c2270e70617008 (patch) | |
| tree | 4e42de809526b5d2c0be2fd0e0f8508f1048d788 /drivers/pci/hotplug/rpaphp_core.c | |
| parent | 90d66d4d86aee7a6a429081c9d95e663463ab436 (diff) | |
| parent | 9195ee1a1f76033eccb424b97ee647625b7af096 (diff) | |
| download | linux-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/hotplug/rpaphp_core.c')
| -rw-r--r-- | drivers/pci/hotplug/rpaphp_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 491986197c47..2316de0fd198 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c @@ -278,7 +278,7 @@ int rpaphp_check_drc_props(struct device_node *dn, char *drc_name, return -EINVAL; } - if (of_find_property(dn->parent, "ibm,drc-info", NULL)) + if (of_property_present(dn->parent, "ibm,drc-info")) return rpaphp_check_drc_props_v2(dn, drc_name, drc_type, be32_to_cpu(*my_index)); else @@ -440,7 +440,7 @@ int rpaphp_add_slot(struct device_node *dn) if (!of_node_name_eq(dn, "pci")) return 0; - if (of_find_property(dn, "ibm,drc-info", NULL)) + if (of_property_present(dn, "ibm,drc-info")) return rpaphp_drc_info_add_slot(dn); else return rpaphp_drc_add_slot(dn); |