leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: sa1100fb: use devm_ioremap_resource()

Browse Source 
Use devm_ioremap_resource() to map the LCD controller memory region,
and remove the unnecessary cleanup for this.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
Russell King 2017-10-17 16:01:12 +02:00 committed by Bartlomiej Zolnierkiewicz
parent e43064ccd4
commit df6b228768
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/video/fbdev/sa1100fb.c
View File

@ -1217,29 +1217,28 @@ static int sa1100fb_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0 || !res) if (irq < 0)
return -EINVAL; return -EINVAL;
if (!request_mem_region(res->start, resource_size(res), "LCD"))
return -EBUSY;
fbi = sa1100fb_init_fbinfo(&pdev->dev); fbi = sa1100fb_init_fbinfo(&pdev->dev);
ret = -ENOMEM; ret = -ENOMEM;
if (!fbi) if (!fbi)
goto failed; goto failed;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
fbi->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(fbi->base)) {
ret = PTR_ERR(fbi->base);
goto failed;
}
fbi->clk = devm_clk_get(&pdev->dev, NULL); fbi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(fbi->clk)) { if (IS_ERR(fbi->clk)) {
ret = PTR_ERR(fbi->clk); ret = PTR_ERR(fbi->clk);
goto failed; goto failed;
} }
fbi->base = ioremap(res->start, resource_size(res));
if (!fbi->base)
goto failed;
/* Initialize video memory */ /* Initialize video memory */
ret = sa1100fb_map_video_memory(fbi); ret = sa1100fb_map_video_memory(fbi);
if (ret) if (ret)
@ -1286,9 +1285,6 @@ static int sa1100fb_probe(struct platform_device *pdev)
err_free_irq: err_free_irq:
free_irq(irq, fbi); free_irq(irq, fbi);
failed: failed:
if (fbi)
iounmap(fbi->base);
release_mem_region(res->start, resource_size(res));
return ret; return ret;
} }