CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Sun Jul 10 01:35:27 UTC 2016

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
Don't assign value to rdev unless we're going to use the value.

Therefore, don't declare the variable unless we're going to assign it a
value.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
    src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.8 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.8	Sun Apr 24 04:26:12 2016
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c	Sun Jul 10 01:35:27 2016
@@ -609,7 +609,6 @@ static struct ttm_tt *radeon_ttm_tt_crea
 
 static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
 {
-	struct radeon_device *rdev;
 	struct radeon_ttm_tt *gtt = (void *)ttm;
 #ifndef __NetBSD__
 	unsigned i;
@@ -631,8 +630,8 @@ static int radeon_ttm_tt_populate(struct
 #endif
 	}
 
-	rdev = radeon_get_rdev(ttm->bdev);
 #if __OS_HAS_AGP
+	struct radeon_device *rdev = radeon_get_rdev(ttm->bdev);
 	if (rdev->flags & RADEON_IS_AGP) {
 		return ttm_agp_tt_populate(ttm);
 	}
@@ -644,6 +643,9 @@ static int radeon_ttm_tt_populate(struct
 #else
 
 #ifdef CONFIG_SWIOTLB
+#if ! __OS_HAS_AGP
+	struct radeon_device *rdev = radeon_get_rdev(ttm->bdev);
+#endif
 	if (swiotlb_nr_tbl()) {
 		return ttm_dma_populate(&gtt->ttm, rdev->dev);
 	}
@@ -674,7 +676,6 @@ static int radeon_ttm_tt_populate(struct
 
 static void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm)
 {
-	struct radeon_device *rdev;
 	struct radeon_ttm_tt *gtt = (void *)ttm;
 #ifndef __NetBSD__
 	unsigned i;
@@ -684,8 +685,8 @@ static void radeon_ttm_tt_unpopulate(str
 	if (slave)
 		return;
 
-	rdev = radeon_get_rdev(ttm->bdev);
 #if __OS_HAS_AGP
+	struct radeon_device *rdev = radeon_get_rdev(ttm->bdev);
 	if (rdev->flags & RADEON_IS_AGP) {
 		ttm_agp_tt_unpopulate(ttm);
 		return;
@@ -698,6 +699,9 @@ static void radeon_ttm_tt_unpopulate(str
 #else
 
 #ifdef CONFIG_SWIOTLB
+#if ! __OS_HAS_AGP
+	struct radeon_device *rdev = radeon_get_rdev(ttm->bdev);
+#endif
 	if (swiotlb_nr_tbl()) {
 		ttm_dma_unpopulate(&gtt->ttm, rdev->dev);
 		return;