From 2e3a228f997e10c345bc62a3e4b061013cd87a64 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 9 Aug 2011 14:30:37 +0100
Subject: [PATCH] --- yaml --- r: 262667 b: refs/heads/master c:
 ab04fc5890381e7dc907e809d27bf0f683de6e82 h: refs/heads/master i:   262665:
 78216da8d77db4603f2fbeb9ee2af5f279436e63   262663:
 d8e75b23d18cc99922f0edbfe0fd28516f0d1918 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/gma500/gem_glue.c | 23 +----------------------
 trunk/drivers/staging/gma500/gem_glue.h |  2 --
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index f96c1acf8ed1..fd1dbbfdea7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87302700402b2708c49f89970c295465cc8e5523
+refs/heads/master: ab04fc5890381e7dc907e809d27bf0f683de6e82
diff --git a/trunk/drivers/staging/gma500/gem_glue.c b/trunk/drivers/staging/gma500/gem_glue.c
index 779ac1a12d24..daac12120653 100644
--- a/trunk/drivers/staging/gma500/gem_glue.c
+++ b/trunk/drivers/staging/gma500/gem_glue.c
@@ -20,26 +20,6 @@
 #include <drm/drmP.h>
 #include <drm/drm.h>
 
-/**
- * Initialize an already allocated GEM object of the specified size with
- * no GEM provided backing store. Instead the caller is responsible for
- * backing the object and handling it.
- */
-int drm_gem_private_object_init(struct drm_device *dev,
-			struct drm_gem_object *obj, size_t size)
-{
-	BUG_ON((size & (PAGE_SIZE - 1)) != 0);
-
-	obj->dev = dev;
-	obj->filp = NULL;
-
-	kref_init(&obj->refcount);
-	atomic_set(&obj->handle_count, 0);
-	obj->size = size;
-
-	return 0;
-}
-
 void drm_gem_object_release_wrap(struct drm_gem_object *obj)
 {
 	/* Remove the list map if one is present */
@@ -51,8 +31,7 @@ void drm_gem_object_release_wrap(struct drm_gem_object *obj)
 		kfree(list->map);
 		list->map = NULL;
 	}
-	if (obj->filp)
-		drm_gem_object_release(obj);
+	drm_gem_object_release(obj);
 }
 
 /**
diff --git a/trunk/drivers/staging/gma500/gem_glue.h b/trunk/drivers/staging/gma500/gem_glue.h
index a0f2bc4e4ae7..ce5ce30f74db 100644
--- a/trunk/drivers/staging/gma500/gem_glue.h
+++ b/trunk/drivers/staging/gma500/gem_glue.h
@@ -1,4 +1,2 @@
 extern void drm_gem_object_release_wrap(struct drm_gem_object *obj);
-extern int drm_gem_private_object_init(struct drm_device *dev,
-			struct drm_gem_object *obj, size_t size);
 extern int gem_create_mmap_offset(struct drm_gem_object *obj);