diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 19:58:33 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-19 09:31:31 +0100 |
| commit | 7b2e36e199846ee7e72f47a921cfa8f1a8dc2546 (patch) | |
| tree | 4cc8181cccbad193fb116020835b2a74819cae91 | |
| parent | 3e892255b3071d4d624edb3d829eee1d579edc27 (diff) | |
| download | barebox-7b2e36e199846ee7e72f47a921cfa8f1a8dc2546.tar.gz barebox-7b2e36e199846ee7e72f47a921cfa8f1a8dc2546.tar.xz | |
video stm/mx2x: simplify memory allocation
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/video/stm.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/drivers/video/stm.c b/drivers/video/stm.c index f0abe4c71e..d2add4183b 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,8 @@ 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 = xrealloc(fb_info->screen_base, size); + fbi->memory_size = size; /** @todo ensure HCLK is active at this point of time! */ |