The patch titled
Subject: drivers/video/mxsfb.c: convert to devm_ioremap_resource()
has been removed from the -mm tree. Its filename was
drivers-video-mxsfbc-convert-to-devm_ioremap_resource.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Subject: drivers/video/mxsfb.c: convert to devm_ioremap_resource()
Converting to devm_ioremap_resource() can make the code cleaner and smaller.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Cc: Shawn Guo <shawn.guo@xxxxxxxxxx>
Cc: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/mxsfb.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff -puN drivers/video/mxsfb.c~drivers-video-mxsfbc-convert-to-devm_ioremap_resource drivers/video/mxsfb.c
--- a/drivers/video/mxsfb.c~drivers-video-mxsfbc-convert-to-devm_ioremap_resource
+++ a/drivers/video/mxsfb.c
@@ -801,22 +801,17 @@ static int mxsfb_probe(struct platform_d
return -ENODEV;
}
- if (!request_mem_region(res->start, resource_size(res), pdev->name))
- return -EBUSY;
-
fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev);
if (!fb_info) {
dev_err(&pdev->dev, "Failed to allocate fbdev\n");
- ret = -ENOMEM;
- goto error_alloc_info;
+ return -ENOMEM;
}
host = to_imxfb_host(fb_info);
- host->base = ioremap(res->start, resource_size(res));
- if (!host->base) {
- dev_err(&pdev->dev, "ioremap failed\n");
- ret = -ENOMEM;
+ host->base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(host->base)) {
+ return PTR_ERR(host->base);
goto error_ioremap;
}
@@ -904,11 +899,8 @@ error_panel_enable:
clk_put(host->clk);
error_getclock:
error_getpin:
- iounmap(host->base);
error_ioremap:
framebuffer_release(fb_info);
-error_alloc_info:
- release_mem_region(res->start, resource_size(res));
return ret;
}
@@ -917,7 +909,6 @@ static int mxsfb_remove(struct platform_
{
struct fb_info *fb_info = platform_get_drvdata(pdev);
struct mxsfb_info *host = to_imxfb_host(fb_info);
- struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (host->enabled)
mxsfb_disable_controller(fb_info);
@@ -925,11 +916,9 @@ static int mxsfb_remove(struct platform_
unregister_framebuffer(fb_info);
kfree(fb_info->pseudo_palette);
mxsfb_free_videomem(host);
- iounmap(host->base);
clk_put(host->clk);
framebuffer_release(fb_info);
- release_mem_region(res->start, resource_size(res));
platform_set_drvdata(pdev, NULL);
_
Patches currently in -mm which might be from fabio.estevam@xxxxxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
