From 9a4cb7eab4f74747cc777a3fef31dbb46e1191e5 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 12 Nov 2008 19:17:18 +0100
Subject: mode: Minor reodering and renaming

---
 linux-core/drm_crtc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linux-core')

diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index 255cc8c2..aa0c4a95 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -1517,7 +1517,7 @@ int drm_mode_addfb(struct drm_device *dev,
 		goto out;
 	}
 
-	r->buffer_id = fb->base.id;
+	r->fb_id = fb->base.id;
 	list_add(&fb->filp_head, &file_priv->fbs);
 
 out:
@@ -1609,7 +1609,7 @@ int drm_mode_getfb(struct drm_device *dev,
 	int ret = 0;
 
 	mutex_lock(&dev->mode_config.mutex);
-	obj = drm_mode_object_find(dev, r->buffer_id, DRM_MODE_OBJECT_FB);
+	obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);
 	if (!obj) {
 		DRM_ERROR("invalid framebuffer id\n");
 		ret = -EINVAL;
@@ -2212,7 +2212,7 @@ int drm_mode_replacefb(struct drm_device *dev,
 
 	/* right replace the current bo attached to this fb with a new bo */
 	mutex_lock(&dev->mode_config.mutex);
-	obj = drm_mode_object_find(dev, r->buffer_id, DRM_MODE_OBJECT_FB);
+	obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);
 	if (!obj) {
 		ret = -EINVAL;
 		goto out;
-- 
cgit v1.2.3