Commit 66d3d0d0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 90d66d4d 9195ee1a

drivers/pci/controller/pci-tegra.c

+2 −2
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ static int tegra_pcie_phys_get(struct tegra_pcie *pcie) 
	struct tegra_pcie_port *port;

	int err;



	if (!soc->has_gen2 || of_find_property(np, "phys", NULL) != NULL)

	if (!soc->has_gen2 || of_property_present(np, "phys"))

		return tegra_pcie_phys_get_legacy(pcie);



	list_for_each_entry(port, &pcie->ports, list) {
@@ -1944,7 +1944,7 @@ static bool of_regulator_bulk_available(struct device_node *np, 
	for (i = 0; i < num_supplies; i++) {

		snprintf(property, 32, "%s-supply", supplies[i].supply);



		if (of_find_property(np, property, NULL) == NULL)

		if (!of_property_present(np, property))

			return false;

	}

drivers/pci/controller/pcie-mediatek.c

+1 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, 
		return err;

	}



	if (of_find_property(dev->of_node, "interrupt-names", NULL))

	if (of_property_present(dev->of_node, "interrupt-names"))

		port->irq = platform_get_irq_byname(pdev, "pcie_irq");

	else

		port->irq = platform_get_irq(pdev, port->slot);

drivers/pci/hotplug/rpaphp_core.c

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

drivers/pci/of.c

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

	}