Module Name: src
Committed By: martin
Date: Sun Sep 15 13:56:27 UTC 2013
Modified Files:
src/sys/dev/ic: siop_common.c
Log Message:
Remove unused variable/ifdef like use
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/siop_common.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/dev/ic/siop_common.c
diff -u src/sys/dev/ic/siop_common.c:1.53 src/sys/dev/ic/siop_common.c:1.54
--- src/sys/dev/ic/siop_common.c:1.53 Sat Nov 13 13:52:02 2010
+++ src/sys/dev/ic/siop_common.c Sun Sep 15 13:56:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_common.c,v 1.53 2010/11/13 13:52:02 uebayasi Exp $ */
+/* $NetBSD: siop_common.c,v 1.54 2013/09/15 13:56:27 martin Exp $ */
/*
* Copyright (c) 2000, 2002 Manuel Bouyer.
@@ -28,7 +28,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.53 2010/11/13 13:52:02 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.54 2013/09/15 13:56:27 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -726,7 +726,9 @@ siop_ma(struct siop_common_cmd *siop_cmd
{
int offset, dbc, sstat;
struct siop_common_softc *sc = siop_cmd->siop_sc;
+#ifdef DEBUG_DR
scr_table_t *table; /* table with partial xfer */
+#endif
/*
* compute how much of the current table didn't get handled when
@@ -742,8 +744,8 @@ siop_ma(struct siop_common_cmd *siop_cmd
offset);
return;
}
- table = &siop_cmd->siop_tables->data[offset];
#ifdef DEBUG_DR
+ table = &siop_cmd->siop_tables->data[offset];
printf("siop_ma: offset %d count=%d addr=0x%x ", offset,
table->count, table->addr);
#endif
@@ -958,7 +960,7 @@ int
siop_modechange(struct siop_common_softc *sc)
{
int retry;
- int sist0, sist1, stest2;
+ int sist1, stest2;
for (retry = 0; retry < 5; retry++) {
/*
@@ -968,7 +970,7 @@ siop_modechange(struct siop_common_softc
* hopefully this will not happen often.
*/
delay(100000);
- sist0 = bus_space_read_1(sc->sc_rt, sc->sc_rh, SIOP_SIST0);
+ (void)bus_space_read_1(sc->sc_rt, sc->sc_rh, SIOP_SIST0);
sist1 = bus_space_read_1(sc->sc_rt, sc->sc_rh, SIOP_SIST1);
if (sist1 & SIEN1_SBMC)
continue; /* we got an irq again */
