From patchwork Tue Aug 18 14:24:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 247894 Delivered-To: patch@linaro.org Received: by 2002:a54:3b12:0:0:0:0:0 with SMTP id j18csp3178486ect; Tue, 18 Aug 2020 07:27:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJuq7taGCbEGjEhhrllvo1JNi6WxxLysMt87oVgepf1PG946JlaDRREiKGOzTLPfpFpleu X-Received: by 2002:a05:6402:1a26:: with SMTP id be6mr19882119edb.162.1597760834006; Tue, 18 Aug 2020 07:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597760834; cv=none; d=google.com; s=arc-20160816; b=mjQLORdXXgzscD9i0hpEtqWp/3VJ247zM3fnIiU+p+kKfpinVWlKupqDTlFgxN4xHp JJdJpBveaW5AX9e69uepLv5YRClG6sQMaU+5zSXJY0xSI44KIUTAN6CysBrooX2mD9tA NcOKq9uL0JBfa+0UoGl3DI1RgOwqtwWJ6EwdeQJHlWTKL/C23fNxGRc9B/nO+GxLD5eZ no4DzIlwkb14JdCwTrrbxLk91z2dPxDuaZ21eGfOCxh9UpKeahEPBrZu4nugFFFT0O/u nF1NFzrQO2WbsraIWJtMxzU9NQLkykX9OzU3LCldStMuxa+68JuyPaoTx2ZHCCSokVnO fkJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=PuWgEOdbtGo4yQPNGw3pMhAirFWsbe0V0E37T1M7siQ=; b=wAQTGkN04VNl9bC0DZAWP3kIYlcSBFYtDSLAXArEtNC9HL4wILZVXLWeVXaNGHiZWx qW7f7is3dYrvzRdwTAvxTyqki+mBpal1mafi3yTmdfsaF7fsPzGhP4PRoUQy6ttDzEJm sdm7A4SR/UyUA5MY8Xeh2gOP8xjWn5Hg+0SnzUxjCeyo7RptTvsADR4O3mnqA+Kg5QwA xOr0y5NvxvhKXYDtfit9O69lRcodlmB7Q32GHoj/dGP+e+5+UNSHGf/u6UFBb/42jGnk c8TE8ECz/r9vzN7Bc5DSLwG2Qx2Z10Or9uRUlwu0AvuSi3tleIEkYW4c2dhqU0lLO3JJ jAHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h7si13339651ejx.254.2020.08.18.07.27.13; Tue, 18 Aug 2020 07:27:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726709AbgHRO1M (ORCPT + 7 others); Tue, 18 Aug 2020 10:27:12 -0400 Received: from lhrrgout.huawei.com ([185.176.76.210]:2620 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726879AbgHRO1I (ORCPT ); Tue, 18 Aug 2020 10:27:08 -0400 Received: from lhreml710-chm.china.huawei.com (unknown [172.18.7.108]) by Forcepoint Email with ESMTP id 7D89130D0973BBB003B5; Tue, 18 Aug 2020 15:27:07 +0100 (IST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Tue, 18 Aug 2020 15:27:07 +0100 From: Jonathan Cameron To: , , , CC: Lorenzo Pieralisi , Bjorn Helgaas , , , Ingo Molnar , , Tony Luck , Fenghua Yu , Thomas Gleixner , , Dan Williams , Song Bao Hua , Jonathan Cameron Subject: [PATCH v3 4/6] ACPI: Rename acpi_map_pxm_to_online_node to pxm_to_online_node Date: Tue, 18 Aug 2020 22:24:28 +0800 Message-ID: <20200818142430.1156547-5-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200818142430.1156547-1-Jonathan.Cameron@huawei.com> References: <20200818142430.1156547-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-ClientProxiedBy: lhreml710-chm.china.huawei.com (10.201.108.61) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 Reviewed-by: Hanjun Guo --- drivers/acpi/nfit/core.c | 3 +-- drivers/acpi/numa/hmat.c | 2 +- include/linux/acpi.h | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) -- 2.19.1 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), }; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index a9fd122ae878..e9f6cd67943e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -420,10 +420,10 @@ int acpi_map_pxm_to_node(int pxm); int acpi_get_node(acpi_handle handle); /** - * acpi_map_pxm_to_online_node - Map proximity ID to online node + * pxm_to_online_node - Map proximity ID to online node * @pxm: ACPI proximity ID * - * This is similar to acpi_map_pxm_to_node(), but always returns an online + * This is similar to pxm_to_node(), but always returns an online * node. When the mapped node from a given proximity ID is offline, it * looks up the node distance table and returns the nearest online node. * @@ -433,14 +433,14 @@ int acpi_get_node(acpi_handle handle); * offline nodes. A node may be offline when SRAT memory entry does not exist, * or NUMA is disabled, ex. "numa=off" on x86. */ -static inline int acpi_map_pxm_to_online_node(int pxm) +static inline int pxm_to_online_node(int pxm) { int node = pxm_to_node(pxm); return numa_map_to_online_node(node); } #else -static inline int acpi_map_pxm_to_online_node(int pxm) +static inline int pxm_to_online_node(int pxm) { return 0; }