Module Name: src
Committed By: martin
Date: Sat Oct 19 19:08:39 UTC 2013
Modified Files:
src/sys/arch/mac68k/mac68k: bus_space.c
Log Message:
Avoid unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/mac68k/mac68k/bus_space.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/arch/mac68k/mac68k/bus_space.c
diff -u src/sys/arch/mac68k/mac68k/bus_space.c:1.31 src/sys/arch/mac68k/mac68k/bus_space.c:1.32
--- src/sys/arch/mac68k/mac68k/bus_space.c:1.31 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mac68k/mac68k/bus_space.c Sat Oct 19 19:08:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.31 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: bus_space.c,v 1.32 2013/10/19 19:08:39 martin Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.31 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.32 2013/10/19 19:08:39 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,7 +139,9 @@ int
bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags,
bus_space_handle_t *hp)
{
+#ifdef DIAGNOSTIC
paddr_t pa, endpa;
+#endif
int error;
/*
@@ -151,10 +153,10 @@ bus_space_map(bus_space_tag_t t, bus_add
if (error)
return (error);
+#ifdef DIAGNOSTIC
pa = m68k_trunc_page(bpa + t);
endpa = m68k_round_page((bpa + t + size) - 1);
-#ifdef DIAGNOSTIC
if (endpa <= pa)
panic("bus_space_map: overflow");
#endif
@@ -269,7 +271,6 @@ int
mac68k_bus_space_probe(bus_space_tag_t t, bus_space_handle_t h,
bus_size_t offset, int size)
{
- int i;
label_t faultbuf;
nofault = &faultbuf;
@@ -280,13 +281,13 @@ mac68k_bus_space_probe(bus_space_tag_t t
switch (size) {
case 1:
- i = bus_space_read_1(t, h, offset);
+ bus_space_read_1(t, h, offset);
break;
case 2:
- i = bus_space_read_2(t, h, offset);
+ bus_space_read_2(t, h, offset);
break;
case 4:
- i = bus_space_read_4(t, h, offset);
+ bus_space_read_4(t, h, offset);
break;
case 8:
default:
