aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-08-14 05:11:06 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-08-30 03:50:20 -0400
commit51617d1bc8f37df703295cf3fd472da15b076ecb (patch)
treea07744735a24495099a99d7d31de81a4a9b0dd72 /drivers/video
parent907355a97f06af8d23c62fcb482cd91b8576972d (diff)
video: mxsfb: simplify use of devm_ioremap_resource
Remove unneeded error handling on the result of a call to platform_get_resource when the value is passed to devm_ioremap_resource. Move the call to platform_get_resource adjacent to the call to devm_ioremap_resource to make the connection between them more clear. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression pdev,res,n,e,e1; expression ret != 0; identifier l; @@ - res = platform_get_resource(pdev, IORESOURCE_MEM, n); ... when != res - if (res == NULL) { ... \(goto l;\|return ret;\) } ... when != res + res = platform_get_resource(pdev, IORESOURCE_MEM, n); e = devm_ioremap_resource(e1, res); // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/mxsfb.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 5861ba2c2a20..91269f6eab8d 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -881,12 +881,6 @@ static int mxsfb_probe(struct platform_device *pdev)
881 if (of_id) 881 if (of_id)
882 pdev->id_entry = of_id->data; 882 pdev->id_entry = of_id->data;
883 883
884 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
885 if (!res) {
886 dev_err(&pdev->dev, "Cannot get memory IO resource\n");
887 return -ENODEV;
888 }
889
890 fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev); 884 fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev);
891 if (!fb_info) { 885 if (!fb_info) {
892 dev_err(&pdev->dev, "Failed to allocate fbdev\n"); 886 dev_err(&pdev->dev, "Failed to allocate fbdev\n");
@@ -895,6 +889,7 @@ static int mxsfb_probe(struct platform_device *pdev)
895 889
896 host = to_imxfb_host(fb_info); 890 host = to_imxfb_host(fb_info);
897 891
892 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
898 host->base = devm_ioremap_resource(&pdev->dev, res); 893 host->base = devm_ioremap_resource(&pdev->dev, res);
899 if (IS_ERR(host->base)) { 894 if (IS_ERR(host->base)) {
900 ret = PTR_ERR(host->base); 895 ret = PTR_ERR(host->base);