Module Name: src
Committed By: martin
Date: Fri Oct 25 16:00:35 UTC 2013
Modified Files:
src/sys/dev/mscp: mscp_disk.c mscp_subr.c mscp_tape.c
Log Message:
Eliminate unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/mscp/mscp_disk.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/mscp/mscp_subr.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/mscp/mscp_tape.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/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.76 src/sys/dev/mscp/mscp_disk.c:1.77
--- src/sys/dev/mscp/mscp_disk.c:1.76 Sat Oct 27 17:18:26 2012
+++ src/sys/dev/mscp/mscp_disk.c Fri Oct 25 16:00:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.76 2012/10/27 17:18:26 chs Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.77 2013/10/25 16:00:35 martin Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.76 2012/10/27 17:18:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.77 2013/10/25 16:00:35 martin Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -320,13 +320,11 @@ void
rastrategy(struct buf *bp)
{
struct ra_softc *ra = mscp_device_lookup(bp->b_dev);
- int unit;
int b;
/*
* Make sure this is a reasonable drive to use.
*/
- unit = DISKUNIT(bp->b_dev);
if (ra == NULL) {
bp->b_error = ENXIO;
goto done;
@@ -728,7 +726,6 @@ rx_putonline(struct rx_softc *rx)
{
struct mscp *mp;
struct mscp_softc *mi = device_private(device_parent(rx->ra_dev));
- volatile int i;
rx->ra_state = DK_CLOSED;
mp = mscp_getcp(mi, MSCP_WAIT);
@@ -738,7 +735,7 @@ rx_putonline(struct rx_softc *rx)
*mp->mscp_addr |= MSCP_OWN | MSCP_INT;
/* Poll away */
- i = bus_space_read_2(mi->mi_iot, mi->mi_iph, 0);
+ bus_space_read_2(mi->mi_iot, mi->mi_iph, 0);
if (tsleep(&rx->ra_state, PRIBIO, "rxonline", 100*100))
rx->ra_state = DK_CLOSED;
Index: src/sys/dev/mscp/mscp_subr.c
diff -u src/sys/dev/mscp/mscp_subr.c:1.45 src/sys/dev/mscp/mscp_subr.c:1.46
--- src/sys/dev/mscp/mscp_subr.c:1.45 Tue Mar 26 23:29:11 2013
+++ src/sys/dev/mscp/mscp_subr.c Fri Oct 25 16:00:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.45 2013/03/26 23:29:11 martin Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.46 2013/10/25 16:00:35 martin Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.45 2013/03/26 23:29:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.46 2013/10/25 16:00:35 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -451,7 +451,7 @@ mscp_init(struct mscp_softc *mi)
mp->mscp_sccc.sccc_errlgfl = 0;
mp->mscp_sccc.sccc_ctlrflags = M_CF_ATTN | M_CF_MISC | M_CF_THIS;
*mp->mscp_addr |= MSCP_OWN | MSCP_INT;
- i = READ_IP;
+ READ_IP;
count = 0;
while (count < DELAYTEN) {
@@ -607,7 +607,6 @@ mscp_kickaway(struct mscp_softc *mi)
void
mscp_dgo(struct mscp_softc *mi, struct mscp_xi *mxi)
{
- volatile int i;
struct mscp *mp;
/*
@@ -617,7 +616,7 @@ mscp_dgo(struct mscp_softc *mi, struct m
mp->mscp_seq.seq_buffer = mxi->mxi_dmam->dm_segs[0].ds_addr;
*mp->mscp_addr |= MSCP_OWN | MSCP_INT;
- i = READ_IP;
+ READ_IP;
}
#ifdef DIAGNOSTIC
Index: src/sys/dev/mscp/mscp_tape.c
diff -u src/sys/dev/mscp/mscp_tape.c:1.39 src/sys/dev/mscp/mscp_tape.c:1.40
--- src/sys/dev/mscp/mscp_tape.c:1.39 Sat Oct 27 17:18:27 2012
+++ src/sys/dev/mscp/mscp_tape.c Fri Oct 25 16:00:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_tape.c,v 1.39 2012/10/27 17:18:27 chs Exp $ */
+/* $NetBSD: mscp_tape.c,v 1.40 2013/10/25 16:00:35 martin Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.39 2012/10/27 17:18:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.40 2013/10/25 16:00:35 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -178,7 +178,6 @@ mt_putonline(struct mt_softc *mt)
struct mscp *mp;
struct mscp_softc *mi =
device_private(device_parent(mt->mt_dev));
- volatile int i;
((volatile struct mt_softc *) mt)->mt_state = MT_OFFLINE;
mp = mscp_getcp(mi, MSCP_WAIT);
@@ -188,7 +187,7 @@ mt_putonline(struct mt_softc *mt)
*mp->mscp_addr |= MSCP_OWN | MSCP_INT;
/* Poll away */
- i = bus_space_read_2(mi->mi_iot, mi->mi_iph, 0);
+ bus_space_read_2(mi->mi_iot, mi->mi_iph, 0);
if (tsleep(&mt->mt_state, PRIBIO, "mtonline", 240 * hz))
return MSCP_FAILED;
@@ -449,7 +448,6 @@ mtcmd(struct mt_softc *mt, int cmd, int
{
struct mscp *mp;
struct mscp_softc *mi = device_private(device_parent(mt->mt_dev));
- volatile int i;
mp = mscp_getcp(mi, MSCP_WAIT);
@@ -508,7 +506,7 @@ mtcmd(struct mt_softc *mt, int cmd, int
break;
}
- i = bus_space_read_2(mi->mi_iot, mi->mi_iph, 0);
+ bus_space_read_2(mi->mi_iot, mi->mi_iph, 0);
tsleep(&mt->mt_inuse, PRIBIO, "mtioctl", 0);
return mt->mt_ioctlerr;
}
