Simplify few qdev_prop_set_bit("start-powered-off") and re-indent.
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
hw/arm/allwinner-h3.c | 3 +--
hw/arm/allwinner-r40.c | 3 +--
hw/arm/bcm2836.c | 4 ++--
hw/arm/fsl-imx6.c | 4 +---
hw/arm/fsl-imx7.c | 12 +++++-------
5 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index f05afddf7e..593244464a 100644
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -251,8 +251,7 @@ static void allwinner_h3_realize(DeviceState *dev, Error
**errp)
* Disable secondary CPUs. Guest EL3 firmware will start
* them via CPU reset control registers.
*/
- qdev_prop_set_bit(DEVICE(&s->cpus[i]), "start-powered-off",
- i > 0);
+ qdev_prop_set_bit(DEVICE(&s->cpus[i]), "start-powered-off", i > 0);
/* All exception levels required */
qdev_prop_set_bit(DEVICE(&s->cpus[i]), "has_el3", true);
diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index a0d367c60d..202a158fb8 100644
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -304,8 +304,7 @@ static void allwinner_r40_realize(DeviceState *dev, Error
**errp)
* Disable secondary CPUs. Guest EL3 firmware will start
* them via CPU reset control registers.
*/
- qdev_prop_set_bit(DEVICE(&s->cpus[i]), "start-powered-off",
- i > 0);
+ qdev_prop_set_bit(DEVICE(&s->cpus[i]), "start-powered-off", i > 0);
/* All exception levels required */
qdev_prop_set_bit(DEVICE(&s->cpus[i]), "has_el3", true);
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 1fdc3be6bb..03e6eb2fb2 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -99,9 +99,9 @@ static void bcm2835_realize(DeviceState *dev, Error **errp)
/* Connect irq/fiq outputs from the interrupt controller. */
sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 0,
- qdev_get_gpio_in(DEVICE(&s->cpu[0].core), ARM_CPU_IRQ));
+ qdev_get_gpio_in(DEVICE(&s->cpu[0].core), ARM_CPU_IRQ));
sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 1,
- qdev_get_gpio_in(DEVICE(&s->cpu[0].core), ARM_CPU_FIQ));
+ qdev_get_gpio_in(DEVICE(&s->cpu[0].core), ARM_CPU_FIQ));
}
static void bcm2836_realize(DeviceState *dev, Error **errp)
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index 17c399a37e..b7f1738a89 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -127,9 +127,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
}
/* All CPU but CPU 0 start in power off mode */
- if (i) {
- qdev_prop_set_bit(DEVICE(&s->cpu[i]), "start-powered-off", true);
- }
+ qdev_prop_set_bit(DEVICE(&s->cpu[i]), "start-powered-off", i > 0);
if (!qdev_realize(DEVICE(&s->cpu[i]), NULL, errp)) {
return;
diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 3138ffeb08..451801f7e8 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -187,13 +187,11 @@ static void fsl_imx7_realize(DeviceState *dev, Error
**errp)
&error_abort);
}
- if (i) {
- /*
- * Secondary CPUs start in powered-down state (and can be
- * powered up via the SRC system reset controller)
- */
- qdev_prop_set_bit(DEVICE(o), "start-powered-off", true);
- }
+ /*
+ * Secondary CPUs start in powered-down state (and can be
+ * powered up via the SRC system reset controller)
+ */
+ qdev_prop_set_bit(DEVICE(o), "start-powered-off", i > 0);
qdev_realize(DEVICE(o), NULL, &error_abort);
}
--
2.41.0
