From 58acb5f8180c981dda5374d27775d46553a2a201 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 16 May 2012 17:08:55 +0200
Subject: [PATCH] --- yaml --- r: 310575 b: refs/heads/master c:
 6037bafa2e676162a86e4f4dee366e394565a0ee h: refs/heads/master i:   310573:
 94d6dd54f5829e013ec5803e6e98b05618a70e94   310571:
 409c2fd651d0977b86d0ad819693d2cb949ffe90   310567:
 acbaa742bf2f9e246ba926bd4f156da68b428a4c   310559:
 6a309fe9f2c987c182a297c9decc668096ec3323 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ac7652ef02fd..74cbc353a559 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 293a1c128ecc523e9a74252ca64220d8081be759
+refs/heads/master: 6037bafa2e676162a86e4f4dee366e394565a0ee
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c
index fc91293c4560..5c8b683029ea 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -689,7 +689,6 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
 				   struct drm_device *dev, uint32_t handle,
 				   uint64_t *offset)
 {
-	struct exynos_drm_gem_obj *exynos_gem_obj;
 	struct drm_gem_object *obj;
 	int ret = 0;
 
@@ -710,15 +709,13 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
 		goto unlock;
 	}
 
-	exynos_gem_obj = to_exynos_gem_obj(obj);
-
-	if (!exynos_gem_obj->base.map_list.map) {
-		ret = drm_gem_create_mmap_offset(&exynos_gem_obj->base);
+	if (!obj->map_list.map) {
+		ret = drm_gem_create_mmap_offset(obj);
 		if (ret)
 			goto out;
 	}
 
-	*offset = (u64)exynos_gem_obj->base.map_list.hash.key << PAGE_SHIFT;
+	*offset = (u64)obj->map_list.hash.key << PAGE_SHIFT;
 	DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset);
 
 out: