acpi/hmat: Update acpi_hmat_type enum with ACPI_HMAT_TYPE_PROXIMITY

ACPI 6.3 changed the subtable "Memory Subsystem Address Range Structure"
to "Memory Proximity Domain Attributes Structure".

Updating and renaming of the structure was included in commit:
ACPICA: ACPI 6.3: HMAT updates (9a8d961f1ef835b0d338fbe13da03cb424e87ae5)

Rename the enum type to match the subtable and structure naming.

Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/hmat/hmat.c b/drivers/acpi/hmat/hmat.c
index 69cdb3c..f166560 100644 (file)
--- a/drivers/acpi/hmat/hmat.c
+++ b/drivers/acpi/hmat/hmat.c
@@ -411,7 +411,7 @@ static int __init hmat_parse_subtable(union acpi_subtable_headers *header,
                return -EINVAL;
 
        switch (hdr->type) {
-       case ACPI_HMAT_TYPE_ADDRESS_RANGE:
+       case ACPI_HMAT_TYPE_PROXIMITY:
                return hmat_parse_proximity_domain(header, end);
        case ACPI_HMAT_TYPE_LOCALITY:
                return hmat_parse_locality(header, end);
@@ -649,7 +649,7 @@ static __init int hmat_init(void)
                goto out_put;
        }
 
-       for (i = ACPI_HMAT_TYPE_ADDRESS_RANGE; i < ACPI_HMAT_TYPE_RESERVED; i++) {
+       for (i = ACPI_HMAT_TYPE_PROXIMITY; i < ACPI_HMAT_TYPE_RESERVED; i++) {
                if (acpi_table_parse_entries(ACPI_SIG_HMAT,
                                             sizeof(struct acpi_table_hmat), i,
                                             hmat_parse_subtable, 0) < 0) {

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index d14037d..22c039e 100644 (file)
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -1395,7 +1395,7 @@ struct acpi_table_hmat {
 /* Values for HMAT structure types */
 
 enum acpi_hmat_type {
-       ACPI_HMAT_TYPE_ADDRESS_RANGE = 0,       /* Memory subsystem address range */
+       ACPI_HMAT_TYPE_PROXIMITY = 0,   /* Memory proximity domain attributes */
        ACPI_HMAT_TYPE_LOCALITY = 1,    /* System locality latency and bandwidth information */
        ACPI_HMAT_TYPE_CACHE = 2,       /* Memory side cache information */
        ACPI_HMAT_TYPE_RESERVED = 3     /* 3 and greater are reserved */