Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 640ba244 authored by Julia Lawall's avatar Julia Lawall Committed by Florian Tobias Schandinat
Browse files

drivers/video/pxa168fb.c: use devm_ functions 



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.

By using devm_ioremap, it also removes a potential memory leak, because
there was no call to iounmap in the probe function.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 8aaaaf3c

drivers/video/pxa168fb.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/fb.h>

#include <linux/fb.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>
@@ -670,7 +671,8 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) 
	/*

	/*

	 * Map LCD controller registers.

	 * Map LCD controller registers.

	 */

	 */

	fbi->reg_base = ioremap_nocache(res->start, resource_size(res));

	fbi->reg_base = devm_ioremap_nocache(&pdev->dev, res->start,

					     resource_size(res));

	if (fbi->reg_base == NULL) {

	if (fbi->reg_base == NULL) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto failed_free_info;

		goto failed_free_info;
@@ -739,8 +741,8 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) 
	/*

	/*

	 * Register irq handler.

	 * Register irq handler.

	 */

	 */

	ret = request_irq(irq, pxa168fb_handle_irq, IRQF_SHARED,

	ret = devm_request_irq(&pdev->dev, irq, pxa168fb_handle_irq,

					info->fix.id, fbi);

			       IRQF_SHARED, info->fix.id, fbi);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&pdev->dev, "unable to request IRQ\n");

		dev_err(&pdev->dev, "unable to request IRQ\n");

		ret = -ENXIO;

		ret = -ENXIO;
@@ -759,14 +761,12 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) 
	if (ret < 0) {

	if (ret < 0) {

		dev_err(&pdev->dev, "Failed to register pxa168-fb: %d\n", ret);

		dev_err(&pdev->dev, "Failed to register pxa168-fb: %d\n", ret);

		ret = -ENXIO;

		ret = -ENXIO;

		goto failed_free_irq;

		goto failed_free_cmap;

	}

	}





	platform_set_drvdata(pdev, fbi);

	platform_set_drvdata(pdev, fbi);

	return 0;

	return 0;





failed_free_irq:

	free_irq(irq, fbi);

failed_free_cmap:

failed_free_cmap:

	fb_dealloc_cmap(&info->cmap);

	fb_dealloc_cmap(&info->cmap);

failed_free_clk:

failed_free_clk:
@@ -808,13 +808,10 @@ static int __devexit pxa168fb_remove(struct platform_device *pdev) 
		fb_dealloc_cmap(&info->cmap);

		fb_dealloc_cmap(&info->cmap);





	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	free_irq(irq, fbi);





	dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len),

	dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len),

				info->screen_base, info->fix.smem_start);

				info->screen_base, info->fix.smem_start);





	iounmap(fbi->reg_base);



	clk_disable(fbi->clk);

	clk_disable(fbi->clk);

	clk_put(fbi->clk);

	clk_put(fbi->clk);