[PATCH-for-9.0? v2 3/8] hw/clock: Pass optional &bool argument to clock_set_ns() - Philippe Mathieu-Daudé

From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Inès Varhol" <ines.varhol@telecom-paris.fr>,
	"Arnaud Minier" <arnaud.minier@telecom-paris.fr>,
	"Damien Hedde" <damien.hedde@dahe.fr>,
	qemu-arm@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
	"Alistair Francis" <alistair@alistair23.me>,
	"Luc Michel" <luc@lmichel.fr>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH-for-9.0? v2 3/8] hw/clock: Pass optional &bool argument to clock_set_ns()
Date: Mon, 25 Mar 2024 14:32:53 +0100	[thread overview]
Message-ID: <20240325133259.57235-4-philmd@linaro.org> (raw)
In-Reply-To: <20240325133259.57235-1-philmd@linaro.org>

Pass optional &bool argument to clock_set_ns().
Since all callers ignore the return value, have
them use NULL.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 docs/devel/clocks.rst | 2 +-
 include/hw/clock.h    | 8 ++------
 hw/arm/stellaris.c    | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/devel/clocks.rst b/docs/devel/clocks.rst
index c4d14bde04..3360e5616d 100644
--- a/docs/devel/clocks.rst
+++ b/docs/devel/clocks.rst
@@ -298,7 +298,7 @@ object during device instance init. For example:
     clk = qdev_init_clock_in(DEVICE(dev), "clk-in", clk_in_callback,
                              dev, ClockUpdate);
     /* set initial value to 10ns / 100MHz */
-    clock_set_ns(clk, 10);
+    clock_set_ns(clk, 10, NULL);
 
 To enforce that the clock is wired up by the board code, you can
 call ``clock_has_source()`` in your device's realize method:
diff --git a/include/hw/clock.h b/include/hw/clock.h
index 474bbc07fe..94ed5ba6e6 100644
--- a/include/hw/clock.h
+++ b/include/hw/clock.h
@@ -195,13 +195,9 @@ static inline bool clock_set_hz(Clock *clk, unsigned hz)
     return changed;
 }
 
-static inline bool clock_set_ns(Clock *clk, unsigned ns)
+static inline void clock_set_ns(Clock *clk, unsigned ns, bool *changed)
 {
-    bool changed = false;
-
-    clock_set(clk, CLOCK_PERIOD_FROM_NS(ns), &changed);
-
-    return changed;
+    clock_set(clk, CLOCK_PERIOD_FROM_NS(ns), changed);
 }
 
 /**
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index a2f998bf9e..d4381beeb7 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -279,7 +279,7 @@ static void ssys_calculate_system_clock(ssys_state *s, bool propagate_clock)
     } else {
         period_ns = 5 * (((s->rcc >> 23) & 0xf) + 1);
     }
-    clock_set_ns(s->sysclk, period_ns);
+    clock_set_ns(s->sysclk, period_ns, NULL);
     if (propagate_clock) {
         clock_propagate(s->sysclk);
     }
-- 
2.41.0


