Module Name: src
Committed By: joerg
Date: Sat Sep 14 13:09:56 UTC 2013
Modified Files:
src/sys/dev/ic: isp.c ninjascsi32.c tpm.c tulip.c
Log Message:
GC unused functions and variables.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/ic/isp.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/ninjascsi32.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/tpm.c
cvs rdiff -u -r1.181 -r1.182 src/sys/dev/ic/tulip.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/isp.c
diff -u src/sys/dev/ic/isp.c:1.124 src/sys/dev/ic/isp.c:1.125
--- src/sys/dev/ic/isp.c:1.124 Sat Sep 14 12:43:08 2013
+++ src/sys/dev/ic/isp.c Sat Sep 14 13:09:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.124 2013/09/14 12:43:08 martin Exp $ */
+/* $NetBSD: isp.c,v 1.125 2013/09/14 13:09:55 joerg Exp $ */
/*
* Machine and OS Independent (well, as best as possible)
* code for the Qlogic ISP SCSI adapters.
@@ -43,7 +43,7 @@
*/
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.124 2013/09/14 12:43:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.125 2013/09/14 13:09:55 joerg Exp $");
#include <dev/ic/isp_netbsd.h>
#endif
#ifdef __FreeBSD__
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
static const char fconf[] = "Chan %d PortDB[%d] changed:\n current =(0x%x@0x%06x 0x%08x%08x 0x%08x%08x)\n database=(0x%x@0x%06x 0x%08x%08x 0x%08x%08x)";
static const char notresp[] = "Not RESPONSE in RESPONSE Queue (type 0x%x) @ idx %d (next %d) nlooked %d";
static const char topology[] = "Chan %d WWPN 0x%08x%08x PortID 0x%06x N-Port Handle %d, Connection '%s'";
-static const char sc4[] = "NVRAM";
static const char bun[] = "bad underrun (count %d, resid %d, status %s)";
static const char lipd[] = "Chan %d LIP destroyed %d active commands";
static const char sacq[] = "unable to acquire scratch area";
Index: src/sys/dev/ic/ninjascsi32.c
diff -u src/sys/dev/ic/ninjascsi32.c:1.22 src/sys/dev/ic/ninjascsi32.c:1.23
--- src/sys/dev/ic/ninjascsi32.c:1.22 Sat Mar 10 20:54:21 2012
+++ src/sys/dev/ic/ninjascsi32.c Sat Sep 14 13:09:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjascsi32.c,v 1.22 2012/03/10 20:54:21 mrg Exp $ */
+/* $NetBSD: ninjascsi32.c,v 1.23 2013/09/14 13:09:55 joerg Exp $ */
/*-
* Copyright (c) 2004, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.22 2012/03/10 20:54:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.23 2013/09/14 13:09:55 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,26 +191,6 @@ njsc32_ireg_read_1(struct njsc32_softc *
return bus_space_read_1(sc->sc_regt, sc->sc_regh, NJSC32_REG_DATA_LOW);
}
-static inline unsigned
-njsc32_ireg_read_2(struct njsc32_softc *sc, int no)
-{
-
- bus_space_write_1(sc->sc_regt, sc->sc_regh, NJSC32_REG_INDEX, no);
- return bus_space_read_2(sc->sc_regt, sc->sc_regh, NJSC32_REG_DATA_LOW);
-}
-
-static inline u_int32_t
-njsc32_ireg_read_4(struct njsc32_softc *sc, int no)
-{
- u_int32_t val;
-
- bus_space_write_1(sc->sc_regt, sc->sc_regh, NJSC32_REG_INDEX, no);
- val = (u_int16_t)bus_space_read_2(sc->sc_regt, sc->sc_regh,
- NJSC32_REG_DATA_LOW);
- return val | (bus_space_read_2(sc->sc_regt, sc->sc_regh,
- NJSC32_REG_DATA_HIGH) << 16);
-}
-
static inline void
njsc32_ireg_write_1(struct njsc32_softc *sc, int no, int val)
{
@@ -227,16 +207,6 @@ njsc32_ireg_write_2(struct njsc32_softc
bus_space_write_2(sc->sc_regt, sc->sc_regh, NJSC32_REG_DATA_LOW, val);
}
-static inline void
-njsc32_ireg_write_4(struct njsc32_softc *sc, int no, u_int32_t val)
-{
-
- bus_space_write_1(sc->sc_regt, sc->sc_regh, NJSC32_REG_INDEX, no);
- bus_space_write_2(sc->sc_regt, sc->sc_regh, NJSC32_REG_DATA_LOW, val);
- bus_space_write_2(sc->sc_regt, sc->sc_regh, NJSC32_REG_DATA_HIGH,
- val >> 16);
-}
-
#define NS(ns) ((ns) / 4) /* nanosecond (>= 50) -> sync value */
#ifdef __STDC__
# define ACKW(n) NJSC32_ACK_WIDTH_ ## n ## CLK
Index: src/sys/dev/ic/tpm.c
diff -u src/sys/dev/ic/tpm.c:1.7 src/sys/dev/ic/tpm.c:1.8
--- src/sys/dev/ic/tpm.c:1.7 Mon Feb 6 02:03:32 2012
+++ src/sys/dev/ic/tpm.c Sat Sep 14 13:09:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm.c,v 1.7 2012/02/06 02:03:32 christos Exp $ */
+/* $NetBSD: tpm.c,v 1.8 2013/09/14 13:09:55 joerg Exp $ */
/*
* Copyright (c) 2008, 2009 Michael Shalayeff
* Copyright (c) 2009, 2010 Hans-Jörg Höxer
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.7 2012/02/06 02:03:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.8 2013/09/14 13:09:55 joerg Exp $");
#if 0
#define TPM_DEBUG
@@ -805,14 +805,6 @@ tpm_legacy_in(bus_space_tag_t iot, bus_s
return bus_space_read_1(iot, ioh, 1);
}
-/* Write single byte using legacy interface. */
-static inline void
-tpm_legacy_out(bus_space_tag_t iot, bus_space_handle_t ioh, int reg, uint8_t v)
-{
- bus_space_write_1(iot, ioh, 0, reg);
- bus_space_write_1(iot, ioh, 1, v);
-}
-
/* Probe for TPM using legacy interface. */
int
tpm_legacy_probe(bus_space_tag_t iot, bus_addr_t iobase)
Index: src/sys/dev/ic/tulip.c
diff -u src/sys/dev/ic/tulip.c:1.181 src/sys/dev/ic/tulip.c:1.182
--- src/sys/dev/ic/tulip.c:1.181 Sun Jul 22 14:32:58 2012
+++ src/sys/dev/ic/tulip.c Sat Sep 14 13:09:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.181 2012/07/22 14:32:58 matt Exp $ */
+/* $NetBSD: tulip.c,v 1.182 2013/09/14 13:09:55 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.181 2012/07/22 14:32:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.182 2013/09/14 13:09:55 joerg Exp $");
#include <sys/param.h>
@@ -77,9 +77,6 @@ static const struct tulip_txthresh_tab t
static const struct tulip_txthresh_tab tlp_10_100_txthresh_tab[] =
TLP_TXTHRESH_TAB_10_100;
-static const struct tulip_txthresh_tab tlp_winb_txthresh_tab[] =
- TLP_TXTHRESH_TAB_WINB;
-
static const struct tulip_txthresh_tab tlp_dm9102_txthresh_tab[] =
TLP_TXTHRESH_TAB_DM9102;
