clocksource/drivers/arm_arch_timer: Use of_property_present() for non-boolean properties

The use of of_property_read_bool() for non-boolean properties is
deprecated in favor of of_property_present() when testing for property
presence.

Signed-off-by: Rob Herring (Arm) <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Daniel Lezcano <[email protected]>

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 2bba81e25aa2d8f5b225da69a23ec1ec5573a609..808f259781fd2a19eebb323a5079eec8e5a3186b 100644 (file)
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1428,7 +1428,7 @@ static int __init arch_timer_of_init(struct device_node *np)
 
        arch_timers_present |= ARCH_TIMER_TYPE_CP15;
 
-       has_names = of_property_read_bool(np, "interrupt-names");
+       has_names = of_property_present(np, "interrupt-names");
 
        for (i = ARCH_TIMER_PHYS_SECURE_PPI; i < ARCH_TIMER_MAX_TIMER_PPI; i++) {
                if (has_names)

diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c
index d1c144d6f328cf0b75d6df5c09baedaa0341be64..985a6d08512b42f499b3e243eb69cc9674bc8e53 100644 (file)
--- a/drivers/clocksource/timer-ti-dm-systimer.c
+++ b/drivers/clocksource/timer-ti-dm-systimer.c
@@ -202,10 +202,10 @@ static bool __init dmtimer_is_preferred(struct device_node *np)
 
        /* Secure gptimer12 is always clocked with a fixed source */
        if (!of_property_read_bool(np, "ti,timer-secure")) {
-               if (!of_property_read_bool(np, "assigned-clocks"))
+               if (!of_property_present(np, "assigned-clocks"))
                        return false;
 
-               if (!of_property_read_bool(np, "assigned-clock-parents"))
+               if (!of_property_present(np, "assigned-clock-parents"))
                        return false;
        }