Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[linux-2.6-microblaze.git] / drivers / video / fbdev / jz4740_fb.c

diff --git a/drivers/video/fbdev/jz4740_fb.c b/drivers/video/fbdev/jz4740_fb.c
index 1450956..0b6fa25 100644 (file)
--- a/drivers/video/fbdev/jz4740_fb.c
+++ b/drivers/video/fbdev/jz4740_fb.c
@@ -457,7 +457,6 @@ static int jzfb_alloc_devmem(struct jzfb *jzfb)
 {
        int max_videosize = 0;
        struct fb_videomode *mode = jzfb->pdata->modes;
-       void *page;
        int i;
 
        for (i = 0; i < jzfb->pdata->num_modes; ++mode, ++i) {
@@ -482,12 +481,6 @@ static int jzfb_alloc_devmem(struct jzfb *jzfb)
        if (!jzfb->vidmem)
                goto err_free_framedesc;
 
-       for (page = jzfb->vidmem;
-                page < jzfb->vidmem + PAGE_ALIGN(jzfb->vidmem_size);
-                page += PAGE_SIZE) {
-               SetPageReserved(virt_to_page(page));
-       }
-
        jzfb->framedesc->next = jzfb->framedesc_phys;
        jzfb->framedesc->addr = jzfb->vidmem_phys;
        jzfb->framedesc->id = 0xdeafbead;
@@ -535,10 +528,8 @@ static int jzfb_probe(struct platform_device *pdev)
        }
 
        fb = framebuffer_alloc(sizeof(struct jzfb), &pdev->dev);
-       if (!fb) {
-               dev_err(&pdev->dev, "Failed to allocate framebuffer device\n");
+       if (!fb)
                return -ENOMEM;
-       }
 
        fb->fbops = &jzfb_ops;
        fb->flags = FBINFO_DEFAULT;