Commit b4bee692 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Florian Tobias Schandinat
Browse files

fbdev: sh_mobile_lcdc: Avoid forward declarations 



Reorder probe/remove functions to avoid forward declarations.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 91fba48d

drivers/video/sh_mobile_lcdcfb.c

+50 −52
Original line number Diff line number Diff line
@@ -1434,7 +1434,56 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb, 
	return NOTIFY_OK;

}



static int sh_mobile_lcdc_remove(struct platform_device *pdev);

static int sh_mobile_lcdc_remove(struct platform_device *pdev)

{

	struct sh_mobile_lcdc_priv *priv = platform_get_drvdata(pdev);

	struct fb_info *info;

	int i;



	fb_unregister_client(&priv->notifier);



	for (i = 0; i < ARRAY_SIZE(priv->ch); i++)

		if (priv->ch[i].info && priv->ch[i].info->dev)

			unregister_framebuffer(priv->ch[i].info);



	sh_mobile_lcdc_stop(priv);



	for (i = 0; i < ARRAY_SIZE(priv->ch); i++) {

		info = priv->ch[i].info;



		if (!info || !info->device)

			continue;



		if (priv->ch[i].sglist)

			vfree(priv->ch[i].sglist);



		if (info->screen_base)

			dma_free_coherent(&pdev->dev, info->fix.smem_len,

					  info->screen_base,

					  priv->ch[i].dma_handle);

		fb_dealloc_cmap(&info->cmap);

		framebuffer_release(info);

	}



	for (i = 0; i < ARRAY_SIZE(priv->ch); i++) {

		if (priv->ch[i].bl)

			sh_mobile_lcdc_bl_remove(priv->ch[i].bl);

	}



	if (priv->dot_clk)

		clk_put(priv->dot_clk);



	if (priv->dev)

		pm_runtime_disable(priv->dev);



	if (priv->base)

		iounmap(priv->base);



	if (priv->irq)

		free_irq(priv->irq, priv);

	kfree(priv);

	return 0;

}



static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)

{
@@ -1691,57 +1740,6 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 
	return error;

}



static int sh_mobile_lcdc_remove(struct platform_device *pdev)

{

	struct sh_mobile_lcdc_priv *priv = platform_get_drvdata(pdev);

	struct fb_info *info;

	int i;



	fb_unregister_client(&priv->notifier);



	for (i = 0; i < ARRAY_SIZE(priv->ch); i++)

		if (priv->ch[i].info && priv->ch[i].info->dev)

			unregister_framebuffer(priv->ch[i].info);



	sh_mobile_lcdc_stop(priv);



	for (i = 0; i < ARRAY_SIZE(priv->ch); i++) {

		info = priv->ch[i].info;



		if (!info || !info->device)

			continue;



		if (priv->ch[i].sglist)

			vfree(priv->ch[i].sglist);



		if (info->screen_base)

			dma_free_coherent(&pdev->dev, info->fix.smem_len,

					  info->screen_base,

					  priv->ch[i].dma_handle);

		fb_dealloc_cmap(&info->cmap);

		framebuffer_release(info);

	}



	for (i = 0; i < ARRAY_SIZE(priv->ch); i++) {

		if (priv->ch[i].bl)

			sh_mobile_lcdc_bl_remove(priv->ch[i].bl);

	}



	if (priv->dot_clk)

		clk_put(priv->dot_clk);



	if (priv->dev)

		pm_runtime_disable(priv->dev);



	if (priv->base)

		iounmap(priv->base);



	if (priv->irq)

		free_irq(priv->irq, priv);

	kfree(priv);

	return 0;

}



static struct platform_driver sh_mobile_lcdc_driver = {

	.driver		= {

		.name		= "sh_mobile_lcdc_fb",