Skip to content

Commit

Permalink
drivers/video/jz4740_fb.c: use devm_ functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Damien Cassou authored and Florian Tobias Schandinat committed Aug 23, 2012
1 parent e07d232 commit b2ca7f4
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions drivers/video/jz4740_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -734,12 +734,6 @@ static int __devinit jzfb_probe(struct platform_device *pdev)

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:
Expand All @@ -756,17 +750,13 @@ 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;
Expand Down

0 comments on commit b2ca7f4

Please sign in to comment.