From: jsg <jsg@openbsd.org>
Date: Thu, 30 Dec 2021 00:25:41 +0000 (+0000)
Subject: combine ifdef blocks
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ca9c4ded6d35636883e3cc4fbe78c30dcf11bed7;p=openbsd

combine ifdef blocks
from Ted Bullock
---

diff --git a/sys/dev/pci/drm/radeon/radeon_kms.c b/sys/dev/pci/drm/radeon/radeon_kms.c
index e298bd83979..1aa439be394 100644
--- a/sys/dev/pci/drm/radeon/radeon_kms.c
+++ b/sys/dev/pci/drm/radeon/radeon_kms.c
@@ -810,17 +810,13 @@ radeondrm_attachhook(struct device *self)
 
 #ifdef __sparc64__
 	fbwscons_setcolormap(&rdev->sf, radeondrm_setcolor);
+	ri = &rdev->sf.sf_ro;
 #else
 	radeondrm_setpal(rdev, ri);
-#endif
-
-#ifndef __sparc64__
 	ri->ri_flg = RI_CENTER | RI_VCONS | RI_WRONLY;
 	rasops_init(ri, 160, 160);
 
 	ri->ri_hw = rdev;
-#else
-	ri = &rdev->sf.sf_ro;
 #endif
 
 	radeondrm_stdscreen.capabilities = ri->ri_caps;