diff options
author | Robert Jennings <rcj@linux.vnet.ibm.com> | 2013-10-28 10:20:50 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-30 01:00:24 -0400 |
commit | ec32dd663da29d0e2e3ca964d6a94c683a6582a9 (patch) | |
tree | 789fbd9ed4a8e4295732cbdf695ecb709cf3fcc8 /arch | |
parent | f5467e28d4e2569b2c71435d438ce3c7f9ac238e (diff) |
powerpc: Fix warnings for arch/powerpc/mm/numa.c
Simple fixes for sparse warnings in this file.
Resolves:
arch/powerpc/mm/numa.c:198:24:
warning: Using plain integer as NULL pointer
arch/powerpc/mm/numa.c:1157:5:
warning: symbol 'hot_add_node_scn_to_nid' was not declared.
Should it be static?
arch/powerpc/mm/numa.c:1238:28:
warning: Using plain integer as NULL pointer
arch/powerpc/mm/numa.c:1538:6:
warning: symbol 'topology_schedule_update' was not declared.
Should it be static?
Signed-off-by: Robert C Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/mm/numa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index c916127f10c3..33d67844062c 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -195,7 +195,7 @@ static const __be32 *of_get_usable_memory(struct device_node *memory) | |||
195 | u32 len; | 195 | u32 len; |
196 | prop = of_get_property(memory, "linux,drconf-usable-memory", &len); | 196 | prop = of_get_property(memory, "linux,drconf-usable-memory", &len); |
197 | if (!prop || len < sizeof(unsigned int)) | 197 | if (!prop || len < sizeof(unsigned int)) |
198 | return 0; | 198 | return NULL; |
199 | return prop; | 199 | return prop; |
200 | } | 200 | } |
201 | 201 | ||
@@ -1154,7 +1154,7 @@ static int hot_add_drconf_scn_to_nid(struct device_node *memory, | |||
1154 | * represented in the device tree as a node (i.e. memory@XXXX) for | 1154 | * represented in the device tree as a node (i.e. memory@XXXX) for |
1155 | * each memblock. | 1155 | * each memblock. |
1156 | */ | 1156 | */ |
1157 | int hot_add_node_scn_to_nid(unsigned long scn_addr) | 1157 | static int hot_add_node_scn_to_nid(unsigned long scn_addr) |
1158 | { | 1158 | { |
1159 | struct device_node *memory; | 1159 | struct device_node *memory; |
1160 | int nid = -1; | 1160 | int nid = -1; |
@@ -1235,7 +1235,7 @@ static u64 hot_add_drconf_memory_max(void) | |||
1235 | struct device_node *memory = NULL; | 1235 | struct device_node *memory = NULL; |
1236 | unsigned int drconf_cell_cnt = 0; | 1236 | unsigned int drconf_cell_cnt = 0; |
1237 | u64 lmb_size = 0; | 1237 | u64 lmb_size = 0; |
1238 | const __be32 *dm = 0; | 1238 | const __be32 *dm = NULL; |
1239 | 1239 | ||
1240 | memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); | 1240 | memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); |
1241 | if (memory) { | 1241 | if (memory) { |
@@ -1535,7 +1535,7 @@ static void topology_work_fn(struct work_struct *work) | |||
1535 | } | 1535 | } |
1536 | static DECLARE_WORK(topology_work, topology_work_fn); | 1536 | static DECLARE_WORK(topology_work, topology_work_fn); |
1537 | 1537 | ||
1538 | void topology_schedule_update(void) | 1538 | static void topology_schedule_update(void) |
1539 | { | 1539 | { |
1540 | schedule_work(&topology_work); | 1540 | schedule_work(&topology_work); |
1541 | } | 1541 | } |