aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2014-01-30 16:19:21 -0500
committerInki Dae <daeinki@gmail.com>2014-03-23 11:36:34 -0400
commit055e0c0615c23516abec8f64a38da20d01c1ee85 (patch)
tree972a3afc76445e6e951e8c3b138fc8c9f2400890
parenta968e72771ea19aaedeeaa4ac9d8339186c302e3 (diff)
drm/exynos: Remove unused/useless fimd_context members
This patch removes a few fimd_context members which are either entirely unused or unneeded. Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 53d92fec665b..94195130ef9e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -107,8 +107,6 @@ struct fimd_win_data {
107struct fimd_context { 107struct fimd_context {
108 struct device *dev; 108 struct device *dev;
109 struct drm_device *drm_dev; 109 struct drm_device *drm_dev;
110 int irq;
111 struct drm_crtc *crtc;
112 struct clk *bus_clk; 110 struct clk *bus_clk;
113 struct clk *lcd_clk; 111 struct clk *lcd_clk;
114 void __iomem *regs; 112 void __iomem *regs;
@@ -120,7 +118,6 @@ struct fimd_context {
120 u32 vidcon1; 118 u32 vidcon1;
121 bool suspended; 119 bool suspended;
122 int pipe; 120 int pipe;
123 struct mutex lock;
124 wait_queue_head_t wait_vsync_queue; 121 wait_queue_head_t wait_vsync_queue;
125 atomic_t wait_vsync_event; 122 atomic_t wait_vsync_event;
126 123
@@ -697,8 +694,6 @@ static void fimd_dpms(struct exynos_drm_manager *mgr, int mode)
697 694
698 DRM_DEBUG_KMS("%d\n", mode); 695 DRM_DEBUG_KMS("%d\n", mode);
699 696
700 mutex_lock(&ctx->lock);
701
702 switch (mode) { 697 switch (mode) {
703 case DRM_MODE_DPMS_ON: 698 case DRM_MODE_DPMS_ON:
704 /* 699 /*
@@ -720,8 +715,6 @@ static void fimd_dpms(struct exynos_drm_manager *mgr, int mode)
720 DRM_DEBUG_KMS("unspecified mode %d\n", mode); 715 DRM_DEBUG_KMS("unspecified mode %d\n", mode);
721 break; 716 break;
722 } 717 }
723
724 mutex_unlock(&ctx->lock);
725} 718}
726 719
727static struct exynos_drm_manager_ops fimd_manager_ops = { 720static struct exynos_drm_manager_ops fimd_manager_ops = {
@@ -947,9 +940,7 @@ static int fimd_probe(struct platform_device *pdev)
947 return -ENXIO; 940 return -ENXIO;
948 } 941 }
949 942
950 ctx->irq = res->start; 943 ret = devm_request_irq(dev, res->start, fimd_irq_handler,
951
952 ret = devm_request_irq(dev, ctx->irq, fimd_irq_handler,
953 0, "drm_fimd", ctx); 944 0, "drm_fimd", ctx);
954 if (ret) { 945 if (ret) {
955 dev_err(dev, "irq request failed.\n"); 946 dev_err(dev, "irq request failed.\n");
@@ -960,8 +951,6 @@ static int fimd_probe(struct platform_device *pdev)
960 init_waitqueue_head(&ctx->wait_vsync_queue); 951 init_waitqueue_head(&ctx->wait_vsync_queue);
961 atomic_set(&ctx->wait_vsync_event, 0); 952 atomic_set(&ctx->wait_vsync_event, 0);
962 953
963 mutex_init(&ctx->lock);
964
965 platform_set_drvdata(pdev, &fimd_manager); 954 platform_set_drvdata(pdev, &fimd_manager);
966 955
967 fimd_manager.ctx = ctx; 956 fimd_manager.ctx = ctx;