Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

[can-eth-gw-linux.git] / drivers / video / jz4740_fb.c

diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
index 3c63fc24bb1f139c197e430d4889aa2b443be706..4d25711b99829926c9033d77240265025efecaa7 100644 (file)
--- a/drivers/video/jz4740_fb.c
+++ b/drivers/video/jz4740_fb.c
@@ -632,23 +632,10 @@ static int __devinit jzfb_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!mem) {
-               dev_err(&pdev->dev, "Failed to get register memory resource\n");
-               return -ENXIO;
-       }
-
-       mem = request_mem_region(mem->start, resource_size(mem), pdev->name);
-       if (!mem) {
-               dev_err(&pdev->dev, "Failed to request register memory region\n");
-               return -EBUSY;
-       }
-
        fb = framebuffer_alloc(sizeof(struct jzfb), &pdev->dev);
        if (!fb) {
                dev_err(&pdev->dev, "Failed to allocate framebuffer device\n");
-               ret = -ENOMEM;
-               goto err_release_mem_region;
+               return -ENOMEM;
        }
 
        fb->fbops = &jzfb_ops;
@@ -657,27 +644,26 @@ static int __devinit jzfb_probe(struct platform_device *pdev)
        jzfb = fb->par;
        jzfb->pdev = pdev;
        jzfb->pdata = pdata;
-       jzfb->mem = mem;
 
-       jzfb->ldclk = clk_get(&pdev->dev, "lcd");
+       jzfb->ldclk = devm_clk_get(&pdev->dev, "lcd");
        if (IS_ERR(jzfb->ldclk)) {
                ret = PTR_ERR(jzfb->ldclk);
                dev_err(&pdev->dev, "Failed to get lcd clock: %d\n", ret);
                goto err_framebuffer_release;
        }
 
-       jzfb->lpclk = clk_get(&pdev->dev, "lcd_pclk");
+       jzfb->lpclk = devm_clk_get(&pdev->dev, "lcd_pclk");
        if (IS_ERR(jzfb->lpclk)) {
                ret = PTR_ERR(jzfb->lpclk);
                dev_err(&pdev->dev, "Failed to get lcd pixel clock: %d\n", ret);
-               goto err_put_ldclk;
+               goto err_framebuffer_release;
        }
 
-       jzfb->base = ioremap(mem->start, resource_size(mem));
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       jzfb->base = devm_request_and_ioremap(&pdev->dev, mem);
        if (!jzfb->base) {
-               dev_err(&pdev->dev, "Failed to ioremap register memory region\n");
                ret = -EBUSY;
-               goto err_put_lpclk;
+               goto err_framebuffer_release;
        }
 
        platform_set_drvdata(pdev, jzfb);
@@ -693,7 +679,7 @@ static int __devinit jzfb_probe(struct platform_device *pdev)
        ret = jzfb_alloc_devmem(jzfb);
        if (ret) {
                dev_err(&pdev->dev, "Failed to allocate video memory\n");
-               goto err_iounmap;
+               goto err_framebuffer_release;
        }
 
        fb->fix = jzfb_fix;
@@ -734,16 +720,8 @@ err_free_devmem:
 
        fb_dealloc_cmap(&fb->cmap);
        jzfb_free_devmem(jzfb);
-err_iounmap:
-       iounmap(jzfb->base);
-err_put_lpclk:
-       clk_put(jzfb->lpclk);
-err_put_ldclk:
-       clk_put(jzfb->ldclk);
 err_framebuffer_release:
        framebuffer_release(fb);
-err_release_mem_region:
-       release_mem_region(mem->start, resource_size(mem));
        return ret;
 }
 
@@ -756,17 +734,11 @@ static int __devexit jzfb_remove(struct platform_device *pdev)
        jz_gpio_bulk_free(jz_lcd_ctrl_pins, jzfb_num_ctrl_pins(jzfb));
        jz_gpio_bulk_free(jz_lcd_data_pins, jzfb_num_data_pins(jzfb));
 
-       iounmap(jzfb->base);
-       release_mem_region(jzfb->mem->start, resource_size(jzfb->mem));
-
        fb_dealloc_cmap(&jzfb->fb->cmap);
        jzfb_free_devmem(jzfb);
 
        platform_set_drvdata(pdev, NULL);
 
-       clk_put(jzfb->lpclk);
-       clk_put(jzfb->ldclk);
-
        framebuffer_release(jzfb->fb);
 
        return 0;