Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbe3039e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

memblock/arm: Use memblock_region_is_memory() for omap fb 



Instead of the deprecated memblock_find()

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5e6f6aa1

arch/arm/plat-omap/fb.c

+1 −5
Original line number Diff line number Diff line
@@ -173,11 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg, 


static int valid_sdram(unsigned long addr, unsigned long size)

{

	struct memblock_region res;



	res.base = addr;

	res.size = size;

	return !memblock_find(&res) && res.base == addr && res.size == size;

	return memblock_region_is_memory(addr, size);

}



static int reserve_sdram(unsigned long addr, unsigned long size)

drivers/video/omap2/vram.c

+2 −6
Original line number Diff line number Diff line
@@ -554,12 +554,8 @@ void __init omap_vram_reserve_sdram_memblock(void) 
	size = PAGE_ALIGN(size);



	if (paddr) {

		struct memblock_region res;



		res.base = paddr;

		res.size = size;

		if ((paddr & ~PAGE_MASK) || memblock_find(&res) ||

		    res.base != paddr || res.size != size) {

		if ((paddr & ~PAGE_MASK) ||

		    !memblock_region_is_memory(paddr, size)) {

			pr_err("Illegal SDRAM region for VRAM\n");

			return;

		}