From: Eric Anholt <anholt@freebsd.org>
Date: Mon, 5 Dec 2005 10:53:06 +0000 (+0000)
Subject: Remove driver.device_is_agp code duplicated in drm_device_find_capability,
X-Git-Tag: libdrm-2_0_1~65
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2911edaed70b164c5886ee4f71df769c5e02e0c0;p=platform%2Fupstream%2Flibdrm.git

Remove driver.device_is_agp code duplicated in drm_device_find_capability,
    when it really wanted to live in drm_device_is_agp.
---

diff --git a/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c
index 0a56510..92fb8e0 100644
--- a/bsd-core/drm_agpsupport.c
+++ b/bsd-core/drm_agpsupport.c
@@ -44,14 +44,6 @@ drm_device_find_capability(drm_device_t *dev, int cap)
 {
 	int ret;
 
-	if (dev->driver.device_is_agp != NULL) {
-		ret = (*dev->driver.device_is_agp)(dev);
-		
-		if (ret != DRM_MIGHT_BE_AGP) {
-			return ret == 2;
-		}
-	}
-
 #ifdef __FreeBSD__
 	/* Code taken from agp.c.  IWBNI that was a public interface. */
 	u_int32_t status;
@@ -96,7 +88,7 @@ int drm_device_is_agp(drm_device_t *dev)
 		 * AGP, 2 = fall back to PCI capability
 		 */
 		ret = (*dev->driver.device_is_agp)(dev);
-		if (ret != 2)
+		if (ret != DRM_MIGHT_BE_AGP)
 			return ret;
 	}