Commit cd42f1db authored by Lakshmi Ramasubramanian's avatar Lakshmi Ramasubramanian Committed by Rob Herring
Browse files

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: default avatarPrakhar Srivastava <prsriva@linux.microsoft.com>
Signed-off-by: default avatarPrakhar Srivastava <prsriva@linux.microsoft.com>
Signed-off-by: default avatarLakshmi Ramasubramanian <nramas@linux.microsoft.com>
Reviewed-by: default avatarThiago Jung Bauermann <bauerman@linux.ibm.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210221174930.27324-13-nramas@linux.microsoft.com
parent 28db15d4

arch/powerpc/include/asm/kexec.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline, 
int setup_purgatory(struct kimage *image, const void *slave_code,

		    const void *fdt, unsigned long kernel_load_addr,

		    unsigned long fdt_load_addr);

int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size);



#ifdef CONFIG_PPC64

struct kexec_buf;

arch/powerpc/kexec/file_load.c

+0 −32
Original line number Diff line number Diff line
@@ -107,35 +107,3 @@ int setup_purgatory(struct kimage *image, const void *slave_code, 


	return 0;

}
 


/**

 * delete_fdt_mem_rsv - delete memory reservation with given address and size

 *

 * Return: 0 on success, or negative errno on error.

 */

int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size)

{

	int i, ret, num_rsvs = fdt_num_mem_rsv(fdt);



	for (i = 0; i < num_rsvs; i++) {

		uint64_t rsv_start, rsv_size;



		ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size);

		if (ret) {

			pr_err("Malformed device tree.\n");

			return -EINVAL;

		}



		if (rsv_start == start && rsv_size == size) {

			ret = fdt_del_mem_rsv(fdt, i);

			if (ret) {

				pr_err("Error deleting device tree reservation.\n");

				return -EINVAL;

			}



			return 0;

		}

	}



	return -ENOENT;

}