[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 22/25] hw/arm/stellaris: Fix code style issues in GPTM co
From: |
Peter Maydell |
Subject: |
[PATCH for-6.2 22/25] hw/arm/stellaris: Fix code style issues in GPTM code |
Date: |
Thu, 12 Aug 2021 10:33:53 +0100 |
Fix the code style issues in the Stellaris general purpose timer
module code, so that when we move it to a different file in a
following patch checkpatch doesn't complain.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/stellaris.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 8c8bd39e2fe..a32c567ce11 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -97,10 +97,11 @@ static void gptm_stop(gptm_state *s, int n)
static void gptm_reload(gptm_state *s, int n, int reset)
{
int64_t tick;
- if (reset)
+ if (reset) {
tick = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
- else
+ } else {
tick = s->tick[n];
+ }
if (s->config == 0) {
/* 32-bit CountDown. */
@@ -227,9 +228,11 @@ static void gptm_write(void *opaque, hwaddr offset,
gptm_state *s = (gptm_state *)opaque;
uint32_t oldval;
- /* The timers should be disabled before changing the configuration.
- We take advantage of this and defer everything until the timer
- is enabled. */
+ /*
+ * The timers should be disabled before changing the configuration.
+ * We take advantage of this and defer everything until the timer
+ * is enabled.
+ */
switch (offset) {
case 0x00: /* CFG */
s->config = value;
--
2.20.1
- Re: [PATCH for-6.2 19/25] hw/arm/msf2: Use Clock input to MSF2_SOC instead of m3clk property, (continued)
[PATCH for-6.2 15/25] hw/arm/nrf51: Wire up sysclk, Peter Maydell, 2021/08/12
[PATCH for-6.2 21/25] hw/timer/armv7m_systick: Use clock inputs instead of system_clock_scale, Peter Maydell, 2021/08/12
[PATCH for-6.2 20/25] hw/arm/msf2-soc: Wire up refclk, Peter Maydell, 2021/08/12
[PATCH for-6.2 22/25] hw/arm/stellaris: Fix code style issues in GPTM code,
Peter Maydell <=
[PATCH for-6.2 24/25] hw/timer/stellaris-gptm: Use Clock input instead of system_clock_scale, Peter Maydell, 2021/08/12
[PATCH for-6.2 18/25] hw/arm/msf2_soc: Don't allocate separate MemoryRegions, Peter Maydell, 2021/08/12
[PATCH for-6.2 23/25] hw/arm/stellaris: Split stellaris-gptm into its own file, Peter Maydell, 2021/08/12
[PATCH for-6.2 25/25] arm: Remove system_clock_scale global, Peter Maydell, 2021/08/12