aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/dss/dispc.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 08137a8a38c..05ff2b91d9e 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -96,7 +96,6 @@ static struct {
96 int ctx_loss_cnt; 96 int ctx_loss_cnt;
97 97
98 int irq; 98 int irq;
99 struct clk *dss_clk;
100 99
101 u32 fifo_size[DISPC_MAX_NR_FIFOS]; 100 u32 fifo_size[DISPC_MAX_NR_FIFOS];
102 /* maps which plane is using a fifo. fifo-id -> plane-id */ 101 /* maps which plane is using a fifo. fifo-id -> plane-id */
@@ -3619,7 +3618,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev)
3619 u32 rev; 3618 u32 rev;
3620 int r = 0; 3619 int r = 0;
3621 struct resource *dispc_mem; 3620 struct resource *dispc_mem;
3622 struct clk *clk;
3623 3621
3624 dispc.pdev = pdev; 3622 dispc.pdev = pdev;
3625 3623
@@ -3646,15 +3644,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev)
3646 return -ENODEV; 3644 return -ENODEV;
3647 } 3645 }
3648 3646
3649 clk = clk_get(&pdev->dev, "fck");
3650 if (IS_ERR(clk)) {
3651 DSSERR("can't get fck\n");
3652 r = PTR_ERR(clk);
3653 return r;
3654 }
3655
3656 dispc.dss_clk = clk;
3657
3658 pm_runtime_enable(&pdev->dev); 3647 pm_runtime_enable(&pdev->dev);
3659 3648
3660 r = dispc_runtime_get(); 3649 r = dispc_runtime_get();
@@ -3675,7 +3664,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev)
3675 3664
3676err_runtime_get: 3665err_runtime_get:
3677 pm_runtime_disable(&pdev->dev); 3666 pm_runtime_disable(&pdev->dev);
3678 clk_put(dispc.dss_clk);
3679 return r; 3667 return r;
3680} 3668}
3681 3669
@@ -3683,8 +3671,6 @@ static int __exit omap_dispchw_remove(struct platform_device *pdev)
3683{ 3671{
3684 pm_runtime_disable(&pdev->dev); 3672 pm_runtime_disable(&pdev->dev);
3685 3673
3686 clk_put(dispc.dss_clk);
3687
3688 return 0; 3674 return 0;
3689} 3675}
3690 3676