5 files changed, 16 insertions, 16 deletions

diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index 25040910c715..40349ae65464 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -48,7 +48,7 @@
  * Definitions for Resource Attributes
  */
 typedef u16 acpi_rs_length;     /* Resource Length field is fixed at 16 bits */
-typedef u32 acpi_rsdesc_size;   /* Max Resource Descriptor size is (Length+3) = (64_k-1)+3 */
+typedef u32 acpi_rsdesc_size;   /* Max Resource Descriptor size is (Length+3) = (64K-1)+3 */
 
 /*
  * Memory Attributes
@@ -332,7 +332,7 @@ struct acpi_resource_address64 {
 };
 
 struct acpi_resource_extended_address64 {
-        ACPI_RESOURCE_ADDRESS_COMMON u8 revision_iD;
+        ACPI_RESOURCE_ADDRESS_COMMON u8 revision_ID;
         u64 granularity;
         u64 minimum;
         u64 maximum;
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index a629a01fc812..59a73e1b2845 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -212,7 +212,7 @@ struct acpi_table_fadt {
         u32 smi_command;        /* 32-bit Port address of SMI command port */
         u8 acpi_enable;         /* Value to write to smi_cmd to enable ACPI */
         u8 acpi_disable;        /* Value to write to smi_cmd to disable ACPI */
-        u8 S4bios_request;      /* Value to write to SMI CMD to enter S4BIOS state */
+        u8 s4_bios_request;     /* Value to write to SMI CMD to enter S4BIOS state */
         u8 pstate_control;      /* Processor performance state control */
         u32 pm1a_event_block;   /* 32-bit Port address of Power Mgt 1a Event Reg Blk */
         u32 pm1b_event_block;   /* 32-bit Port address of Power Mgt 1b Event Reg Blk */
@@ -230,8 +230,8 @@ struct acpi_table_fadt {
         u8 gpe1_block_length;   /* Byte Length of ports at gpe1_block */
         u8 gpe1_base;           /* Offset in GPE number space where GPE1 events start */
         u8 cst_control;         /* Support for the _CST object and C States change notification */
-        u16 C2latency;          /* Worst case HW latency to enter/exit C2 state */
-        u16 C3latency;          /* Worst case HW latency to enter/exit C3 state */
+        u16 c2_latency;         /* Worst case HW latency to enter/exit C2 state */
+        u16 c3_latency;         /* Worst case HW latency to enter/exit C3 state */
         u16 flush_size;         /* Processor's memory cache line width, in bytes */
         u16 flush_stride;       /* Number of flush strides that need to be read */
         u8 duty_offset;         /* Processor duty cycle index in processor's P_CNT reg */
@@ -291,7 +291,7 @@ struct acpi_table_fadt {
 #define ACPI_FADT_S4_RTC_VALID      (1<<16)     /* 16: [V4] Contents of RTC_STS valid after S4 wake (ACPI 3.0) */
 #define ACPI_FADT_REMOTE_POWER_ON   (1<<17)     /* 17: [V4] System is compatible with remote power on (ACPI 3.0) */
 #define ACPI_FADT_APIC_CLUSTER      (1<<18)     /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */
-#define ACPI_FADT_APIC_PHYSICAL     (1<<19)     /* 19: [V4] All local x_aPICs must use physical dest mode (ACPI 3.0) */
+#define ACPI_FADT_APIC_PHYSICAL     (1<<19)     /* 19: [V4] All local xAPICs must use physical dest mode (ACPI 3.0) */
 #define ACPI_FADT_HW_REDUCED        (1<<20)     /* 20: [V5] ACPI hardware is not implemented (ACPI 5.0) */
 #define ACPI_FADT_LOW_POWER_S0      (1<<21)     /* 21: [V5] S0 power savings are equal or better than S3 (ACPI 5.0) */
 
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 9ac26b464be1..300d14e7c5d5 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -676,7 +676,7 @@ struct acpi_madt_local_apic {
 struct acpi_madt_io_apic {
         struct acpi_subtable_header header;
         u8 id;                  /* I/O APIC ID */
-        u8 reserved;            /* Reserved - must be zero */
+        u8 reserved;            /* reserved - must be zero */
         u32 address;            /* APIC physical address */
         u32 global_irq_base;    /* Global system interrupt where INTI lines start */
 };
@@ -794,11 +794,11 @@ struct acpi_madt_generic_interrupt {
 
 struct acpi_madt_generic_distributor {
         struct acpi_subtable_header header;
-        u16 reserved;           /* Reserved - must be zero */
+        u16 reserved;           /* reserved - must be zero */
         u32 gic_id;
         u64 base_address;
         u32 global_irq_base;
-        u32 reserved2;          /* Reserved - must be zero */
+        u32 reserved2;          /* reserved - must be zero */
 };
 
 /*
@@ -841,7 +841,7 @@ struct acpi_table_msct {
         u64 max_address;        /* Max physical address in system */
 };
 
-/* Subtable - Maximum Proximity Domain Information. Version 1 */
+/* subtable - Maximum Proximity Domain Information. Version 1 */
 
 struct acpi_msct_proximity {
         u8 revision;
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 34198bf293ac..d9ceb3d31629 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -66,7 +66,7 @@
 #define ACPI_SIG_DBGP           "DBGP"  /* Debug Port table */
 #define ACPI_SIG_DMAR           "DMAR"  /* DMA Remapping table */
 #define ACPI_SIG_HPET           "HPET"  /* High Precision Event Timer table */
-#define ACPI_SIG_IBFT           "IBFT"  /* i_sCSI Boot Firmware Table */
+#define ACPI_SIG_IBFT           "IBFT"  /* iSCSI Boot Firmware Table */
 #define ACPI_SIG_IVRS           "IVRS"  /* I/O Virtualization Reporting Structure */
 #define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"  /* Management Controller Host Interface table */
@@ -334,8 +334,8 @@ struct acpi_dmar_reserved_memory {
         struct acpi_dmar_header header;
         u16 reserved;
         u16 segment;
-        u64 base_address;       /* 4_k aligned base address */
-        u64 end_address;        /* 4_k aligned limit address */
+        u64 base_address;       /* 4K aligned base address */
+        u64 end_address;        /* 4K aligned limit address */
 };
 
 /* Masks for Flags field above */
@@ -565,7 +565,7 @@ struct acpi_ivrs_hardware {
 /* Masks for Info field above */
 
 #define ACPI_IVHD_MSI_NUMBER_MASK   0x001F      /* 5 bits, MSI message number */
-#define ACPI_IVHD_UNIT_ID_MASK      0x1F00      /* 5 bits, unit_iD */
+#define ACPI_IVHD_UNIT_ID_MASK      0x1F00      /* 5 bits, unit_ID */
 
 /*
  * Device Entries for IVHD subtable, appear after struct acpi_ivrs_hardware structure.
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index bc4a3272f95a..3af87de6a68c 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -173,7 +173,7 @@ typedef u64 acpi_physical_address;
  * to indicate that special precautions must be taken to avoid alignment faults.
  * (IA64 or ia64 is currently used by existing compilers to indicate IPF.)
  *
- * Note: Em64_t and other X86-64 processors support misaligned transfers,
+ * Note: EM64T and other X86-64 processors support misaligned transfers,
  * so there is no need to define this flag.
  */
 #if defined (__IA64__) || defined (__ia64__)
@@ -636,7 +636,7 @@ typedef u32 acpi_event_type;
 #define ACPI_NUM_FIXED_EVENTS           ACPI_EVENT_MAX + 1
 
 /*
- * Event Status - Per event
+ * Event status - Per event
  * -------------
  * The encoding of acpi_event_status is illustrated below.
  * Note that a set bit (1) indicates the property is TRUE