leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: iMX: visstrim_m10: use arm_memblock_steal

Browse Source 
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>
This commit is contained in:
Russell King 2012-08-29 11:12:56 +01:00
parent c5dfdbe0c7
commit 895576427d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
View File

@ -32,12 +32,12 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/memblock.h>
#include <media/soc_camera.h> #include <media/soc_camera.h>
#include <sound/tlv320aic32x4.h> #include <sound/tlv320aic32x4.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/memblock.h>
#include <asm/system.h> #include <asm/system.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/iomux-mx27.h> #include <mach/iomux-mx27.h>
@ -219,10 +219,8 @@ static void __init visstrim_camera_init(void)
static void __init visstrim_reserve(void) static void __init visstrim_reserve(void)
{ {
/* reserve 4 MiB for mx2-camera */ /* 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); 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 */ /* GPIOs used as events for applications */