Commit 857d423c authored by Rob Herring's avatar Rob Herring Committed by Michael Ellerman
Browse files

powerpc: Use of_property_present() for testing DT property presence 



It is preferred to use typed property access functions (i.e.
of_property_read_<type> functions) rather than low-level
of_get_property/of_find_property functions for reading properties. As
part of this, convert of_get_property/of_find_property calls to the
recently added of_property_present() helper when we just want to test
for presence of a property and nothing more.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
[mpe: Drop change in ppc4xx_probe_pci_bridge(), formatting]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230310144657.1541039-1-robh@kernel.org
parent af8bc682

arch/powerpc/kernel/legacy_serial.c

+4 −4
Original line number Diff line number Diff line
@@ -171,11 +171,11 @@ static int __init add_legacy_soc_port(struct device_node *np, 
	/* We only support ports that have a clock frequency properly

	 * encoded in the device-tree.

	 */

	if (of_get_property(np, "clock-frequency", NULL) == NULL)

	if (!of_property_present(np, "clock-frequency"))

		return -1;



	/* if reg-offset don't try to use it */

	if ((of_get_property(np, "reg-offset", NULL) != NULL))

	if (of_property_present(np, "reg-offset"))

		return -1;



	/* if rtas uses this device, don't try to use it as well */
@@ -237,7 +237,7 @@ static int __init add_legacy_isa_port(struct device_node *np, 
	 * Note: Don't even try on P8 lpc, we know it's not directly mapped

	 */

	if (!of_device_is_compatible(isa_brg, "ibm,power8-lpc") ||

	    of_get_property(isa_brg, "ranges", NULL)) {

	    of_property_present(isa_brg, "ranges")) {

		taddr = of_translate_address(np, reg);

		if (taddr == OF_BAD_ADDR)

			taddr = 0;
@@ -268,7 +268,7 @@ static int __init add_legacy_pci_port(struct device_node *np, 
	 * compatible UARTs on PCI need all sort of quirks (port offsets

	 * etc...) that this code doesn't know about

	 */

	if (of_get_property(np, "clock-frequency", NULL) == NULL)

	if (!of_property_present(np, "clock-frequency"))

		return -1;



	/* Get the PCI address. Assume BAR 0 */

arch/powerpc/platforms/44x/iss4xx.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void __init iss4xx_init_irq(void) 


	/* Find top level interrupt controller */

	for_each_node_with_property(np, "interrupt-controller") {

		if (of_get_property(np, "interrupts", NULL) == NULL)

		if (!of_property_present(np, "interrupts"))

			break;

	}

	if (np == NULL)

arch/powerpc/platforms/44x/ppc476.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void __init ppc47x_init_irq(void) 


	/* Find top level interrupt controller */

	for_each_node_with_property(np, "interrupt-controller") {

		if (of_get_property(np, "interrupts", NULL) == NULL)

		if (!of_property_present(np, "interrupts"))

			break;

	}

	if (np == NULL)

arch/powerpc/platforms/cell/spu_manage.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static int __init of_has_vicinity(void) 
	struct device_node *dn;



	for_each_node_by_type(dn, "spe") {

		if (of_find_property(dn, "vicinity", NULL))  {

		if (of_property_present(dn, "vicinity"))  {

			of_node_put(dn);

			return 1;

		}

arch/powerpc/platforms/powermac/pic.c

+1 −2
Original line number Diff line number Diff line
@@ -475,8 +475,7 @@ static int __init pmac_pic_probe_mpic(void) 


	/* We can have up to 2 MPICs cascaded */

	for_each_node_by_type(np, "open-pic") {

		if (master == NULL &&

		    of_get_property(np, "interrupts", NULL) == NULL)

		if (master == NULL && !of_property_present(np, "interrupts"))

			master = of_node_get(np);

		else if (slave == NULL)

			slave = of_node_get(np);