Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Delete unused function delete_fdt_mem_rsv()

delete_fdt_mem_rsv() defined in "arch/powerpc/kexec/file_load.c"
has been renamed to fdt_find_and_del_mem_rsv(), and moved to
"drivers/of/kexec.c".

Remove delete_fdt_mem_rsv() in "arch/powerpc/kexec/file_load.c".

Co-developed-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
Signed-off-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210221174930.27324-13-nramas@linux.microsoft.com

authored by

Lakshmi Ramasubramanian and committed by
Rob Herring
cd42f1db 28db15d4

-33
-1
arch/powerpc/include/asm/kexec.h
··· 115 115 int setup_purgatory(struct kimage *image, const void *slave_code, 116 116 const void *fdt, unsigned long kernel_load_addr, 117 117 unsigned long fdt_load_addr); 118 - int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size); 119 118 120 119 #ifdef CONFIG_PPC64 121 120 struct kexec_buf;
-32
arch/powerpc/kexec/file_load.c
··· 107 107 108 108 return 0; 109 109 } 110 - 111 - /** 112 - * delete_fdt_mem_rsv - delete memory reservation with given address and size 113 - * 114 - * Return: 0 on success, or negative errno on error. 115 - */ 116 - int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size) 117 - { 118 - int i, ret, num_rsvs = fdt_num_mem_rsv(fdt); 119 - 120 - for (i = 0; i < num_rsvs; i++) { 121 - uint64_t rsv_start, rsv_size; 122 - 123 - ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size); 124 - if (ret) { 125 - pr_err("Malformed device tree.\n"); 126 - return -EINVAL; 127 - } 128 - 129 - if (rsv_start == start && rsv_size == size) { 130 - ret = fdt_del_mem_rsv(fdt, i); 131 - if (ret) { 132 - pr_err("Error deleting device tree reservation.\n"); 133 - return -EINVAL; 134 - } 135 - 136 - return 0; 137 - } 138 - } 139 - 140 - return -ENOENT; 141 - }