video: mxsfb: Convert to devm_ioremap_resource()
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/1 video: mxsfb: Convert to devm_ioremap_resource()
From: Fabio Estevam <[email protected]>
Converting to devm_ioremap_resource() can make the code cleaner and smaller.
--- drivers/video/mxsfb.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/video/mxsfb.c +4 -15
@@ -801,22 +801,17 @@ static int mxsfb_probe(struct platform_device *pdev)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_device *pdev) {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_device *pdev)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 );
Signature · 1 line
1.7.9.5
Quoted 4 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Converting to
devm_ioremap_resource()can make the code cleaner and smaller.
While you are there, you may want to use devm_kzalloc() and devm_clk_get() as well.
Shawn
Quoted 71 lines
Signed-off-by Fabio Estevam <[email protected]>--- drivers/video/mxsfb.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)drivers/video/mxsfb.c +4
-15@@ -801,22 +801,17 @@ static int mxsfb_probe(struct platform_device *pdev)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_device *pdev) {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_device *pdev)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 );Signature · 1 line
1.7.9.5
Quoted 8 lines · Shawn Guo
Quoted 4 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Converting to
devm_ioremap_resource()can make the code cleaner and smaller.While you are there, you may want to use
devm_kzalloc()anddevm_clk_get()as well.
Actually I'm working on a series to convert mxsfb driver to generic of_videomode bindings, and already had a cleanup patch to move all these calls to managed functions. To ease the merge process, I plan to have the series go via arm-soc tree.
Shawn