Commit b2ca7f4d authored by Damien Cassou's avatar Damien Cassou Committed by Florian Tobias Schandinat

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: default avatarDamien Cassou <damien.cassou@lifl.fr>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent e07d2323
...@@ -659,25 +659,25 @@ static int __devinit jzfb_probe(struct platform_device *pdev) ...@@ -659,25 +659,25 @@ static int __devinit jzfb_probe(struct platform_device *pdev)
jzfb->pdata = pdata; jzfb->pdata = pdata;
jzfb->mem = mem; jzfb->mem = mem;
jzfb->ldclk = clk_get(&pdev->dev, "lcd"); jzfb->ldclk = devm_clk_get(&pdev->dev, "lcd");
if (IS_ERR(jzfb->ldclk)) { if (IS_ERR(jzfb->ldclk)) {
ret = PTR_ERR(jzfb->ldclk); ret = PTR_ERR(jzfb->ldclk);
dev_err(&pdev->dev, "Failed to get lcd clock: %d\n", ret); dev_err(&pdev->dev, "Failed to get lcd clock: %d\n", ret);
goto err_framebuffer_release; 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)) { if (IS_ERR(jzfb->lpclk)) {
ret = PTR_ERR(jzfb->lpclk); ret = PTR_ERR(jzfb->lpclk);
dev_err(&pdev->dev, "Failed to get lcd pixel clock: %d\n", ret); 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) { if (!jzfb->base) {
dev_err(&pdev->dev, "Failed to ioremap register memory region\n"); dev_err(&pdev->dev, "Failed to ioremap register memory region\n");
ret = -EBUSY; ret = -EBUSY;
goto err_put_lpclk; goto err_framebuffer_release;
} }
platform_set_drvdata(pdev, jzfb); platform_set_drvdata(pdev, jzfb);
...@@ -693,7 +693,7 @@ static int __devinit jzfb_probe(struct platform_device *pdev) ...@@ -693,7 +693,7 @@ static int __devinit jzfb_probe(struct platform_device *pdev)
ret = jzfb_alloc_devmem(jzfb); ret = jzfb_alloc_devmem(jzfb);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to allocate video memory\n"); dev_err(&pdev->dev, "Failed to allocate video memory\n");
goto err_iounmap; goto err_framebuffer_release;
} }
fb->fix = jzfb_fix; fb->fix = jzfb_fix;
...@@ -734,12 +734,6 @@ static int __devinit jzfb_probe(struct platform_device *pdev) ...@@ -734,12 +734,6 @@ static int __devinit jzfb_probe(struct platform_device *pdev)
fb_dealloc_cmap(&fb->cmap); fb_dealloc_cmap(&fb->cmap);
jzfb_free_devmem(jzfb); 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: err_framebuffer_release:
framebuffer_release(fb); framebuffer_release(fb);
err_release_mem_region: err_release_mem_region:
...@@ -756,7 +750,6 @@ static int __devexit jzfb_remove(struct platform_device *pdev) ...@@ -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_ctrl_pins, jzfb_num_ctrl_pins(jzfb));
jz_gpio_bulk_free(jz_lcd_data_pins, jzfb_num_data_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)); release_mem_region(jzfb->mem->start, resource_size(jzfb->mem));
fb_dealloc_cmap(&jzfb->fb->cmap); fb_dealloc_cmap(&jzfb->fb->cmap);
...@@ -764,9 +757,6 @@ static int __devexit jzfb_remove(struct platform_device *pdev) ...@@ -764,9 +757,6 @@ static int __devexit jzfb_remove(struct platform_device *pdev)
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
clk_put(jzfb->lpclk);
clk_put(jzfb->ldclk);
framebuffer_release(jzfb->fb); framebuffer_release(jzfb->fb);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment