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

Commit 7b554088 authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Tomi Valkeinen
Browse files

video: fbdev: pxa168fb: Use devm_clk_get 



This patch introduces the use of managed resource function
devm_clk_get instead of clk_get and removes corresponding calls
to clk_put in the probe and remove functions.

To be compatible with the change various gotos are replaced with
direct returns, and unneeded label failed_put_clk is dropped.

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent c4e6774d

drivers/video/fbdev/pxa168fb.c

+4 −10
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int pxa168fb_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	clk = clk_get(&pdev->dev, "LCDCLK");

	clk = devm_clk_get(&pdev->dev, "LCDCLK");

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "unable to get LCDCLK");

		return PTR_ERR(clk);
@@ -624,21 +624,18 @@ static int pxa168fb_probe(struct platform_device *pdev) 
	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

		dev_err(&pdev->dev, "no IO memory defined\n");

		ret = -ENOENT;

		goto failed_put_clk;

		return -ENOENT;

	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "no IRQ defined\n");

		ret = -ENOENT;

		goto failed_put_clk;

		return -ENOENT;

	}



	info = framebuffer_alloc(sizeof(struct pxa168fb_info), &pdev->dev);

	if (info == NULL) {

		ret = -ENOMEM;

		goto failed_put_clk;

		return -ENOMEM;

	}



	/* Initialize private data */
@@ -776,8 +773,6 @@ static int pxa168fb_probe(struct platform_device *pdev) 
			info->screen_base, fbi->fb_start_dma);

failed_free_info:

	kfree(info);

failed_put_clk:

	clk_put(clk);



	dev_err(&pdev->dev, "frame buffer device init failed with %d\n", ret);

	return ret;
@@ -813,7 +808,6 @@ static int pxa168fb_remove(struct platform_device *pdev) 
				info->screen_base, info->fix.smem_start);



	clk_disable(fbi->clk);

	clk_put(fbi->clk);



	framebuffer_release(info);