From: Zhen Lei <thunder.leizhen@huawei.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Rob Herring <robh+dt@kernel.org>,
"Frank Rowand" <frowand.list@gmail.com>,
devicetree <devicetree@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-mm <linux-mm@kvack.org>
Cc: Zefan Li <lizefan@huawei.com>, Xinwei Hu <huxinwei@huawei.com>,
"Tianhong Ding" <dingtianhong@huawei.com>,
Hanjun Guo <guohanjun@huawei.com>,
Zhen Lei <thunder.leizhen@huawei.com>
Subject: [PATCH v8 07/16] of_numa: Use pr_fmt()
Date: Thu, 1 Sep 2016 14:54:58 +0800 [thread overview]
Message-ID: <1472712907-12700-8-git-send-email-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <1472712907-12700-1-git-send-email-thunder.leizhen@huawei.com>
From: Kefeng Wang <wangkefeng.wang@huawei.com>
Use pr_fmt to prefix kernel output.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Rob Herring <robh@kernel.org>
---
drivers/of/of_numa.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 0d7459b..f63d4b0d 100644
--- a/drivers/of/of_numa.c
+++ b/drivers/of/of_numa.c
@@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#define pr_fmt(fmt) "OF: NUMA: " fmt
+
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/nodemask.h>
@@ -49,10 +51,9 @@ static void __init of_numa_parse_cpu_nodes(void)
if (r)
continue;
- pr_debug("NUMA: CPU on %u\n", nid);
+ pr_debug("CPU on %u\n", nid);
if (nid >= MAX_NUMNODES)
- pr_warn("NUMA: Node id %u exceeds maximum value\n",
- nid);
+ pr_warn("Node id %u exceeds maximum value\n", nid);
else
node_set(nid, numa_nodes_parsed);
}
@@ -76,7 +77,7 @@ static int __init of_numa_parse_memory_nodes(void)
continue;
if (nid >= MAX_NUMNODES) {
- pr_warn("NUMA: Node id %u exceeds maximum value\n", nid);
+ pr_warn("Node id %u exceeds maximum value\n", nid);
r = -EINVAL;
}
@@ -85,7 +86,7 @@ static int __init of_numa_parse_memory_nodes(void)
if (!i || r) {
of_node_put(np);
- pr_err("NUMA: bad property in memory node\n");
+ pr_err("bad property in memory node\n");
return r ? : -EINVAL;
}
}
@@ -99,17 +100,17 @@ static int __init of_numa_parse_distance_map_v1(struct device_node *map)
int entry_count;
int i;
- pr_info("NUMA: parsing numa-distance-map-v1\n");
+ pr_info("parsing numa-distance-map-v1\n");
matrix = of_get_property(map, "distance-matrix", NULL);
if (!matrix) {
- pr_err("NUMA: No distance-matrix property in distance-map\n");
+ pr_err("No distance-matrix property in distance-map\n");
return -EINVAL;
}
entry_count = of_property_count_u32_elems(map, "distance-matrix");
if (entry_count <= 0) {
- pr_err("NUMA: Invalid distance-matrix\n");
+ pr_err("Invalid distance-matrix\n");
return -EINVAL;
}
@@ -124,7 +125,7 @@ static int __init of_numa_parse_distance_map_v1(struct device_node *map)
matrix++;
numa_set_distance(nodea, nodeb, distance);
- pr_debug("NUMA: distance[node%d -> node%d] = %d\n",
+ pr_debug("distance[node%d -> node%d] = %d\n",
nodea, nodeb, distance);
/* Set default distance of node B->A same as A->B */
@@ -171,7 +172,7 @@ int of_node_to_nid(struct device_node *device)
np = of_get_next_parent(np);
}
if (np && r)
- pr_warn("NUMA: Invalid \"numa-node-id\" property in node %s\n",
+ pr_warn("Invalid \"numa-node-id\" property in node %s\n",
np->name);
of_node_put(np);
--
2.5.0
next prev parent reply other threads:[~2016-09-01 6:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-01 6:54 [PATCH v8 00/16] fix some type infos and bugs for arm64/of numa Zhen Lei
2016-09-01 6:54 ` [PATCH v8 01/16] of/numa: remove a duplicated pr_debug information Zhen Lei
2016-09-01 6:54 ` [PATCH v8 02/16] of/numa: fix a memory@ node can only contains one memory block Zhen Lei
2016-09-01 6:54 ` [PATCH v8 03/16] of/numa: add nid check for " Zhen Lei
2016-09-08 13:40 ` Rob Herring
2016-09-01 6:54 ` [PATCH v8 04/16] of/numa: remove a duplicated warning Zhen Lei
2016-09-01 6:54 ` [PATCH v8 05/16] arm64/numa: avoid inconsistent information to be printed Zhen Lei
2016-09-01 6:54 ` [PATCH v8 06/16] of_numa: Use of_get_next_parent to simplify code Zhen Lei
2016-09-01 6:54 ` Zhen Lei [this message]
2016-09-01 6:54 ` [PATCH v8 08/16] arm64: numa: Use pr_fmt() Zhen Lei
2016-09-01 6:55 ` [PATCH v8 09/16] arm64/numa: support HAVE_SETUP_PER_CPU_AREA Zhen Lei
2016-09-01 6:55 ` [PATCH v8 10/16] mm/memblock: add a new function memblock_alloc_near_nid Zhen Lei
2016-09-09 3:49 ` Leizhen (ThunderTown)
2016-10-11 1:44 ` Leizhen (ThunderTown)
2016-10-11 10:16 ` Will Deacon
2016-10-11 11:04 ` Leizhen (ThunderTown)
2016-09-01 6:55 ` [PATCH v8 11/16] arm64/numa: support HAVE_MEMORYLESS_NODES Zhen Lei
2016-09-01 6:55 ` [PATCH v8 12/16] arm64/numa: remove some useless code Zhen Lei
2016-09-01 6:55 ` [PATCH v8 13/16] arm64/numa: remove the limitation that cpu0 must bind to node0 Zhen Lei
2016-09-01 6:55 ` [PATCH v8 14/16] of/numa: remove the constraint on the distances of node pairs Zhen Lei
2016-09-01 6:55 ` [PATCH v8 15/16] Documentation: " Zhen Lei
2016-09-01 6:55 ` [PATCH v8 16/16] arm64/numa: define numa_distance as array to simplify code Zhen Lei
2016-09-08 11:01 ` [PATCH v8 00/16] fix some type infos and bugs for arm64/of numa Will Deacon
2016-09-09 2:07 ` Leizhen (ThunderTown)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472712907-12700-8-git-send-email-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=dingtianhong@huawei.com \
--cc=frowand.list@gmail.com \
--cc=guohanjun@huawei.com \
--cc=huxinwei@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lizefan@huawei.com \
--cc=robh+dt@kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).