From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1PemEb-0004JH-Dp for barebox@lists.infradead.org; Mon, 17 Jan 2011 10:22:50 +0000 From: Sascha Hauer Date: Mon, 17 Jan 2011 11:22:43 +0100 Message-Id: <1295259766-19301-2-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1295259766-19301-1-git-send-email-s.hauer@pengutronix.de> References: <1295259766-19301-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 1/4] video stm/mx2x: simplify memory allocation To: barebox@lists.infradead.org Signed-off-by: Sascha Hauer --- drivers/video/stm.c | 29 +++++------------------------ 1 files changed, 5 insertions(+), 24 deletions(-) diff --git a/drivers/video/stm.c b/drivers/video/stm.c index f0abe4c..ecf450c 100644 --- a/drivers/video/stm.c +++ b/drivers/video/stm.c @@ -209,24 +209,6 @@ static inline unsigned calc_line_length(unsigned ppl, unsigned bpp) return (ppl * bpp) >> 3; } -static int stmfb_memory_mmgt(struct fb_info *fb_info, unsigned size) -{ - struct imxfb_info *fbi = fb_info->priv; - - if (fbi->memory_size != 0) { - free(fb_info->screen_base); - fb_info->screen_base = NULL; - fbi->memory_size = 0; - } - - if (fbi->memory_size == 0) { - fb_info->screen_base = xzalloc(size); - fbi->memory_size = size; - } - - return 0; -} - static void stmfb_enable_controller(struct fb_info *fb_info) { struct imxfb_info *fbi = fb_info->priv; @@ -308,7 +290,6 @@ static int stmfb_activate_var(struct fb_info *fb_info) struct imx_fb_videomode *pdata = fbi->pdata; struct fb_videomode *mode = fb_info->mode; uint32_t reg; - int ret; unsigned size; /* @@ -317,11 +298,11 @@ static int stmfb_activate_var(struct fb_info *fb_info) size = calc_line_length(mode->xres, fb_info->bits_per_pixel) * mode->yres; - ret = stmfb_memory_mmgt(fb_info, size); - if (ret != 0) { - dev_err(fbi->hw_dev, "Cannot allocate framebuffer memory\n"); - return ret; - } + fb_info->screen_base = realloc(fb_info->screen_base, size); + if (!fb_info->screen_base) + return -ENOMEM; + memset(fb_info->screen_base, 0, size); + fbi->memory_size = size; /** @todo ensure HCLK is active at this point of time! */ -- 1.7.2.3 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox