summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorJonathan Cameron <Jonathan.Cameron@huawei.com>2020-08-18 22:24:28 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-09-24 12:57:38 +0200
commit4eb3723f18e9ba4d4b13d82b6f7e68dd50a852ea (patch)
tree12d49bb799ff98f60a397c31a4a9c8af413003bc /drivers/acpi
parentfe205d984e7730f4d21f6f8ebc60f0698404ac31 (diff)
downloadlinux-stable-4eb3723f18e9ba4d4b13d82b6f7e68dd50a852ea.tar.gz
linux-stable-4eb3723f18e9ba4d4b13d82b6f7e68dd50a852ea.tar.bz2
linux-stable-4eb3723f18e9ba4d4b13d82b6f7e68dd50a852ea.zip
ACPI: Rename acpi_map_pxm_to_online_node() to pxm_to_online_node()
As this function is no longer allowed to create new mappings let us rename it to reflect this. Note all nodes should already exist before any of the users of this function are called. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/nfit/core.c3
-rw-r--r--drivers/acpi/numa/hmat.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index ea0557cb54f7..8df2f16d1fdf 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -3006,8 +3006,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,
ndr_desc->provider_data = nfit_spa;
ndr_desc->attr_groups = acpi_nfit_region_attribute_groups;
if (spa->flags & ACPI_NFIT_PROXIMITY_VALID) {
- ndr_desc->numa_node = acpi_map_pxm_to_online_node(
- spa->proximity_domain);
+ ndr_desc->numa_node = pxm_to_online_node(spa->proximity_domain);
ndr_desc->target_node = pxm_to_node(spa->proximity_domain);
} else {
ndr_desc->numa_node = NUMA_NO_NODE;
diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c
index cf6df2df26cd..e7add2609c03 100644
--- a/drivers/acpi/numa/hmat.c
+++ b/drivers/acpi/numa/hmat.c
@@ -664,7 +664,7 @@ static void hmat_register_target_device(struct memory_target *target,
goto out_pdev;
}
- pdev->dev.numa_node = acpi_map_pxm_to_online_node(target->memory_pxm);
+ pdev->dev.numa_node = pxm_to_online_node(target->memory_pxm);
info = (struct memregion_info) {
.target_node = pxm_to_node(target->memory_pxm),
};