From d2646fb00b27f8d7ece27b199bab554e6c11813f Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
Date: Wed, 30 Sep 2015 22:45:58 +0000
Subject: Nuke a #if 0/#endif block and a related variable. No plans to ever
 make this work better than it does now. Eliminates a stray use of
 LABELSECTOR.

ok miod@
---
 sys/arch/sgi/stand/boot/diskio.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/sgi/stand/boot/diskio.c b/sys/arch/sgi/stand/boot/diskio.c
index 0df8cf46f97..c21690bd4a1 100644
--- a/sys/arch/sgi/stand/boot/diskio.c
+++ b/sys/arch/sgi/stand/boot/diskio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskio.c,v 1.9 2014/07/12 21:03:38 tedu Exp $ */
+/*	$OpenBSD: diskio.c,v 1.10 2015/09/30 22:45:57 krw Exp $ */
 
 /*
  * Copyright (c) 2000 Opsycon AB  (www.opsycon.se)
@@ -73,7 +73,6 @@ dioopen(struct open_file *f, ...)
 	struct dio_softc *sc;
 	struct disklabel *lp;
 	long fd;
-	daddr32_t labelsector;
 	va_list ap;
 
 	va_start(ap, f);
@@ -101,23 +100,6 @@ dioopen(struct open_file *f, ...)
 	lp->d_partitions[partition].p_offset = 0;
 	lp->d_partitions[0].p_size = 0x7fff0000;
 
-	labelsector = LABELSECTOR;
-
-#if 0
-	/* Try to read disk label and partition table information. */
-	i = diostrategy(sc, F_READ, (daddr32_t)labelsector, DEV_BSIZE, buf, &cnt);
-
-	if (i == 0 && cnt == DEV_BSIZE)
-		msg = getdisklabel(buf, lp);
-	else
-		msg = "rd err";
-
-	if (msg) {
-		printf("%s: %s\n", ctlr, msg);
-		return (ENXIO);
-	}
-#endif
-
 	return (0);
 }
 
-- 
cgit v1.2.3