ACPI/NUMA: Squash acpi_numa_slit_init() into acpi_parse_slit()

After removing architectural code the helper function
acpi_numa_slit_init() is no longer needed. Squash it into
acpi_parse_slit(). No functional changes intended.

Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Robert Richter <rrichter@amd.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
index e4d53e3660fd85ec23b21d7dccac672a325570cd..430ddcfb8312ca0c68a4a836bde34dcbcd65cacd 100644 (file)
--- a/drivers/acpi/numa/srat.c
+++ b/drivers/acpi/numa/srat.c
@@ -218,10 +218,16 @@ __weak int __init numa_fill_memblks(u64 start, u64 end)
  * I/O localities since SRAT does not list them.  I/O localities are
  * not supported at this point.
  */
-static void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
+static int __init acpi_parse_slit(struct acpi_table_header *table)
 {
+       struct acpi_table_slit *slit = (struct acpi_table_slit *)table;
        int i, j;
 
+       if (!slit_valid(slit)) {
+               pr_info("SLIT table looks invalid. Not used.\n");
+               return -EINVAL;
+       }
+
        for (i = 0; i < slit->locality_count; i++) {
                const int from_node = pxm_to_node(i);
 
@@ -238,6 +244,8 @@ static void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
                                slit->entry[slit->locality_count * i + j]);
                }
        }
+
+       return 0;
 }
 
 static int __init
@@ -341,19 +349,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header,
        return 0;
 }
 
-static int __init acpi_parse_slit(struct acpi_table_header *table)
-{
-       struct acpi_table_slit *slit = (struct acpi_table_slit *)table;
-
-       if (!slit_valid(slit)) {
-               pr_info("SLIT table looks invalid. Not used.\n");
-               return -EINVAL;
-       }
-       acpi_numa_slit_init(slit);
-
-       return 0;
-}
-
 void __init __weak
 acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
 {