Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

fbdev: sh_mobile_lcdc: Move pm runtime enable to probe()

Browse source 
The pm_runtime_enable() and pm_runtime_resume() calls don't belong to
sh_mobile_lcdc_setup_clocks(). Move them to the probe function. Remove
the unneeded pm_runtime_resume() call.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2011-09-07 15:47:07 +02:00
parent 217e9c4353
commit 4774c12aac
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/video/sh_mobile_lcdcfb.c
View file

@ -191,6 +191,7 @@ static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev,
int clock_source, int clock_source,
struct sh_mobile_lcdc_priv *priv) struct sh_mobile_lcdc_priv *priv)
{ {
struct clk *clk;
char *str; char *str;
switch (clock_source) { switch (clock_source) {
@ -210,21 +211,16 @@ static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev,
return -EINVAL; return -EINVAL;
} }
if (str) { if (str == NULL)
priv->dot_clk = clk_get(&pdev->dev, str); return 0;
if (IS_ERR(priv->dot_clk)) {
dev_err(&pdev->dev, "cannot get dot clock %s\n", str); clk = clk_get(&pdev->dev, str);
return PTR_ERR(priv->dot_clk); if (IS_ERR(clk)) {
} dev_err(&pdev->dev, "cannot get dot clock %s\n", str);
return PTR_ERR(clk);
} }
/* Runtime PM support involves two step for this driver: priv->dot_clk = clk;
* 1) Enable Runtime PM
* 2) Force Runtime PM Resume since hardware is accessed from probe()
*/
priv->dev = &pdev->dev;
pm_runtime_enable(priv->dev);
pm_runtime_resume(priv->dev);
return 0; return 0;
} }
@ -1513,11 +1509,10 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
sh_mobile_lcdc_bl_remove(priv->ch[i].bl); sh_mobile_lcdc_bl_remove(priv->ch[i].bl);
} }
if (priv->dot_clk) if (priv->dot_clk) {
pm_runtime_disable(&pdev->dev);
clk_put(priv->dot_clk); clk_put(priv->dot_clk);
}
if (priv->dev)
pm_runtime_disable(priv->dev);
if (priv->base) if (priv->base)
iounmap(priv->base); iounmap(priv->base);
@ -1739,6 +1734,8 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
priv->dev = &pdev->dev;
priv->meram_dev = pdata->meram_dev;
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
error = request_irq(i, sh_mobile_lcdc_irq, 0, error = request_irq(i, sh_mobile_lcdc_irq, 0,
@ -1804,7 +1801,8 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
goto err1; goto err1;
} }
priv->meram_dev = pdata->meram_dev; /* Enable runtime PM. */
pm_runtime_enable(&pdev->dev);
for (i = 0; i < num_channels; i++) { for (i = 0; i < num_channels; i++) {
struct sh_mobile_lcdc_chan *ch = priv->ch + i; struct sh_mobile_lcdc_chan *ch = priv->ch + i;