diff options
author | Alastair D'Silva <alastair@d-silva.org> | 2016-08-01 02:32:51 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-08-09 02:52:00 -0400 |
commit | 9dc512819e4b723856773f5a018865c20441072f (patch) | |
tree | 21807c2cb5b2ac3c33be26aff8d9aaea3268ea9c | |
parent | bc14c49195e49b3231c01e4c44e3e5456c940b94 (diff) |
powerpc: Fix unused function warning 'lmb_to_memblock'
This patch fixes the following warning:
arch/powerpc/platforms/pseries/hotplug-memory.c:323:29: error: 'lmb_to_memblock' defined but not used [-Werror=unused-function]
static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb)
^~~~~~~~~~~~~~~
The only consumer of this function is 'dlpar_remove_lmb', which is
enabled with CONFIG_MEMORY_HOTREMOVE, so move it into the same
ifdef block.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-memory.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 43f7beb2902d..76ec104e88be 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c | |||
@@ -320,19 +320,6 @@ static int dlpar_remove_device_tree_lmb(struct of_drconf_cell *lmb) | |||
320 | return dlpar_update_device_tree_lmb(lmb); | 320 | return dlpar_update_device_tree_lmb(lmb); |
321 | } | 321 | } |
322 | 322 | ||
323 | static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb) | ||
324 | { | ||
325 | unsigned long section_nr; | ||
326 | struct mem_section *mem_sect; | ||
327 | struct memory_block *mem_block; | ||
328 | |||
329 | section_nr = pfn_to_section_nr(PFN_DOWN(lmb->base_addr)); | ||
330 | mem_sect = __nr_to_section(section_nr); | ||
331 | |||
332 | mem_block = find_memory_block(mem_sect); | ||
333 | return mem_block; | ||
334 | } | ||
335 | |||
336 | #ifdef CONFIG_MEMORY_HOTREMOVE | 323 | #ifdef CONFIG_MEMORY_HOTREMOVE |
337 | static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size) | 324 | static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size) |
338 | { | 325 | { |
@@ -420,6 +407,19 @@ static bool lmb_is_removable(struct of_drconf_cell *lmb) | |||
420 | 407 | ||
421 | static int dlpar_add_lmb(struct of_drconf_cell *); | 408 | static int dlpar_add_lmb(struct of_drconf_cell *); |
422 | 409 | ||
410 | static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb) | ||
411 | { | ||
412 | unsigned long section_nr; | ||
413 | struct mem_section *mem_sect; | ||
414 | struct memory_block *mem_block; | ||
415 | |||
416 | section_nr = pfn_to_section_nr(PFN_DOWN(lmb->base_addr)); | ||
417 | mem_sect = __nr_to_section(section_nr); | ||
418 | |||
419 | mem_block = find_memory_block(mem_sect); | ||
420 | return mem_block; | ||
421 | } | ||
422 | |||
423 | static int dlpar_remove_lmb(struct of_drconf_cell *lmb) | 423 | static int dlpar_remove_lmb(struct of_drconf_cell *lmb) |
424 | { | 424 | { |
425 | struct memory_block *mem_block; | 425 | struct memory_block *mem_block; |