Skip to content

Commit

Permalink
ARM: iMX: visstrim_m10: use arm_memblock_steal
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Aug 29, 2012
1 parent c5dfdbe commit 8955764
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 8955764

Please sign in to comment.