summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2005-12-05 10:53:06 +0000
committerEric Anholt <anholt@freebsd.org>2005-12-05 10:53:06 +0000
commit2911edaed70b164c5886ee4f71df769c5e02e0c0 (patch)
treedc15acbf6f2c331e085a775ca0d2e6e4d62b27b1
parent0b4fdc81d15c1ff8acfe6fcdfcdd58a13fb3696e (diff)
Remove driver.device_is_agp code duplicated in drm_device_find_capability,
when it really wanted to live in drm_device_is_agp.
-rw-r--r--bsd-core/drm_agpsupport.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c
index 0a565105..92fb8e0d 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;
}