diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 22:53:33 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-30 09:38:18 +1000 |
| commit | fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b (patch) | |
| tree | ea2d64ccff37e5d97ed94abab8851ac89dd5d1da | |
| parent | 23ddc0243d7313942b94f1a2e44e6394f7bb996e (diff) | |
drm: kill gem_free_object_unlocked driver callback
Not used by any current driver.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 4 | ||||
| -rw-r--r-- | include/drm/drmP.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index bf92d07510df..cff7317d3830 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -474,9 +474,7 @@ drm_gem_object_free_unlocked(struct kref *kref) struct drm_gem_object *obj = (struct drm_gem_object *) kref; struct drm_device *dev = obj->dev; - if (dev->driver->gem_free_object_unlocked != NULL) - dev->driver->gem_free_object_unlocked(obj); - else if (dev->driver->gem_free_object != NULL) { + if (dev->driver->gem_free_object != NULL) { mutex_lock(&dev->struct_mutex); dev->driver->gem_free_object(obj); mutex_unlock(&dev->struct_mutex); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index d5a2b8869246..6dbdbf45cd1a 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -802,7 +802,6 @@ struct drm_driver { */ int (*gem_init_object) (struct drm_gem_object *obj); void (*gem_free_object) (struct drm_gem_object *obj); - void (*gem_free_object_unlocked) (struct drm_gem_object *obj); /* vga arb irq handler */ void (*vgaarb_irq)(struct drm_device *dev, bool state); |