arm/acpi: switch to plain bool

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>

diff --git a/xen/arch/arm/acpi/boot.c b/xen/arch/arm/acpi/boot.c
index 6101bf39c91db20b43f42dacc6217f307b0a3c0c..9b29769a10301b614faa50ebe381e1ed0cccbe73 100644 (file)
--- a/xen/arch/arm/acpi/boot.c
+++ b/xen/arch/arm/acpi/boot.c
@@ -53,7 +53,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
     int i;
     int rc;
     u64 mpidr = processor->arm_mpidr & MPIDR_HWID_MASK;
-    bool_t enabled = !!(processor->flags & ACPI_MADT_ENABLED);
+    bool enabled = processor->flags & ACPI_MADT_ENABLED;
 
     if ( mpidr == MPIDR_INVALID )
     {
@@ -190,8 +190,8 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
     return -EINVAL;
 }
 
-static bool_t __initdata param_acpi_off;
-static bool_t __initdata param_acpi_force;
+static bool __initdata param_acpi_off;
+static bool __initdata param_acpi_force;
 
 static int __init parse_acpi_param(const char *arg)
 {

diff --git a/xen/arch/arm/acpi/lib.c b/xen/arch/arm/acpi/lib.c
index 70131b0736ea276bd766b670d6b47225a7916e94..ada5298a385ff80347ddc0382865e9c299ec3a6d 100644 (file)
--- a/xen/arch/arm/acpi/lib.c
+++ b/xen/arch/arm/acpi/lib.c
@@ -48,14 +48,14 @@ char *__acpi_map_table(paddr_t phys, unsigned long size)
     return ((char *) base + offset);
 }
 
-/* 1 to indicate PSCI 0.2+ is implemented */
-bool_t __init acpi_psci_present(void)
+/* True to indicate PSCI 0.2+ is implemented */
+bool __init acpi_psci_present(void)
 {
     return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT;
 }
 
-/* 1 to indicate HVC is present instead of SMC as the PSCI conduit */
-bool_t __init acpi_psci_hvc_present(void)
+/* True to indicate HVC is present instead of SMC as the PSCI conduit */
+bool __init acpi_psci_hvc_present(void)
 {
     return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;
 }

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 92f173be0c232ff57564cb843c38f4bdaafefe84..fd3b0981d599c4908047970a0e481425996209f4 100644 (file)
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -55,7 +55,7 @@ struct bootinfo __initdata bootinfo;
 struct cpuinfo_arm __read_mostly boot_cpu_data;
 
 #ifdef CONFIG_ACPI
-bool_t __read_mostly acpi_disabled;
+bool __read_mostly acpi_disabled;
 #endif
 
 #ifdef CONFIG_ARM_32

diff --git a/xen/include/asm-arm/acpi.h b/xen/include/asm-arm/acpi.h
index 9f954d39e160dc7f18ce0cdd9083c212c2fca638..c183b6bb6e1d6927ace1f47e1e458cba50cbf6e1 100644 (file)
--- a/xen/include/asm-arm/acpi.h
+++ b/xen/include/asm-arm/acpi.h
@@ -43,8 +43,8 @@ typedef enum {
     TBL_MMAX,
 } EFI_MEM_RES;
 
-bool_t __init acpi_psci_present(void);
-bool_t __init acpi_psci_hvc_present(void);
+bool __init acpi_psci_present(void);
+bool __init acpi_psci_hvc_present(void);
 void __init acpi_smp_init_cpus(void);
 
 /*
@@ -57,19 +57,19 @@ void __init acpi_smp_init_cpus(void);
 paddr_t acpi_get_table_offset(struct membank tbl_add[], EFI_MEM_RES index);
 
 #ifdef CONFIG_ACPI
-extern bool_t acpi_disabled;
+extern bool acpi_disabled;
 /* Basic configuration for ACPI */
 static inline void disable_acpi(void)
 {
-    acpi_disabled = 1;
+    acpi_disabled = true;
 }
 
 static inline void enable_acpi(void)
 {
-    acpi_disabled = 0;
+    acpi_disabled = false;
 }
 #else
-#define acpi_disabled (1)
+#define acpi_disabled (true)
 #define disable_acpi()
 #define enable_acpi()
 #endif