drivers/video/jz4740_fb.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches. This patch uses these functions for data that is allocated in the
probe function of a platform device and is only freed in the remove function.

Signed-off-by: Damien Cassou <damien.cassou@lifl.fr>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
index de366937c93362a68c73bcd6c18ba7e3f035241a..7669770e41d52562d7b71c9dd3f39617ee125253 100644 (file)
--- a/drivers/video/jz4740_fb.c
+++ b/drivers/video/jz4740_fb.c
@@ -659,25 +659,25 @@ static int __devinit jzfb_probe(struct platform_device *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));
+       jzfb->base = devm_ioremap(&pdev->dev, mem->start, resource_size(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 +693,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,12 +734,6 @@ 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:
@@ -756,7 +750,6 @@ 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);
@@ -764,9 +757,6 @@ static int __devexit jzfb_remove(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, NULL);
 
-       clk_put(jzfb->lpclk);
-       clk_put(jzfb->ldclk);
-
        framebuffer_release(jzfb->fb);
 
        return 0;