From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 29 Aug 2012 10:12:56 +0000 (+0100)
Subject: ARM: iMX: visstrim_m10: use arm_memblock_steal
X-Git-Tag: firefly_0821_release~3680^2~1898^2~3^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=895576427dca617d0b1cc9dd2c450d82c58d67a9;p=firefly-linux-kernel-4.4.55.git
ARM: iMX: visstrim_m10: use arm_memblock_steal
Use the provided function rather than re-coding this bit of code.
This also gets us protection against using these functions from
invalid contexts.
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index dff82eb57cd9..8036ad8ab046 100644
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -32,12 +32,12 @@
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/leds.h>
-#include <linux/memblock.h>
#include <media/soc_camera.h>
#include <sound/tlv320aic32x4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include <asm/memblock.h>
#include <asm/system.h>
#include <mach/common.h>
#include <mach/iomux-mx27.h>
@@ -219,10 +219,8 @@ static void __init visstrim_camera_init(void)
static void __init visstrim_reserve(void)
{
/* reserve 4 MiB for mx2-camera */
- mx2_camera_base = memblock_alloc(MX2_CAMERA_BUF_SIZE,
+ mx2_camera_base = memblock_steal(MX2_CAMERA_BUF_SIZE,
MX2_CAMERA_BUF_SIZE);
- memblock_free(mx2_camera_base, MX2_CAMERA_BUF_SIZE);
- memblock_remove(mx2_camera_base, MX2_CAMERA_BUF_SIZE);
}
/* GPIOs used as events for applications */