Module Name: src
Committed By: christos
Date: Wed Oct 16 18:20:17 UTC 2013
Modified Files:
src/sys/dev/pci: auvia.c coram.c cxdtv.c eso.c
src/sys/dev/pci/bktr: bktr_card.c
src/sys/dev/pci/hdaudio: hdaudio.c
Log Message:
remove unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/auvia.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/coram.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/cxdtv.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/bktr/bktr_card.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/hdaudio/hdaudio.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/pci/auvia.c
diff -u src/sys/dev/pci/auvia.c:1.75 src/sys/dev/pci/auvia.c:1.76
--- src/sys/dev/pci/auvia.c:1.75 Wed Nov 23 22:35:58 2011
+++ src/sys/dev/pci/auvia.c Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: auvia.c,v 1.75 2011/11/24 03:35:58 mrg Exp $ */
+/* $NetBSD: auvia.c,v 1.76 2013/10/16 18:20:16 christos Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.75 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.76 2013/10/16 18:20:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1076,11 +1076,9 @@ auvia_build_dma_ops(struct auvia_softc *
struct auvia_dma *p, void *start, void *end, int blksize)
{
struct auvia_dma_op *op;
- struct auvia_dma *dp;
bus_addr_t s;
size_t l;
- dp = ch->sc_dma_ops_dma;
op = ch->sc_dma_ops;
s = p->map->dm_segs[0].ds_addr;
l = ((char *)end - (char *)start);
Index: src/sys/dev/pci/coram.c
diff -u src/sys/dev/pci/coram.c:1.11 src/sys/dev/pci/coram.c:1.12
--- src/sys/dev/pci/coram.c:1.11 Mon Oct 29 08:59:43 2012
+++ src/sys/dev/pci/coram.c Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: coram.c,v 1.11 2012/10/29 12:59:43 chs Exp $ */
+/* $NetBSD: coram.c,v 1.12 2013/10/16 18:20:16 christos Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.11 2012/10/29 12:59:43 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.12 2013/10/16 18:20:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -450,9 +450,6 @@ done:
static bool
coram_resume(device_t dv, const pmf_qual_t *qual)
{
- struct coram_softc *sc;
- sc = device_private(dv);
-
return true;
}
@@ -774,10 +771,6 @@ coram_dtv_stop_transfer(void *cookie)
static int
coram_mpeg_reset(struct coram_softc *sc)
{
- uint32_t v;
-
- v = (uint32_t)-1;
-
/* hold RISC in reset */
bus_space_write_4(sc->sc_memt, sc->sc_memh, DEV_CNTRL2, 0);
Index: src/sys/dev/pci/cxdtv.c
diff -u src/sys/dev/pci/cxdtv.c:1.12 src/sys/dev/pci/cxdtv.c:1.13
--- src/sys/dev/pci/cxdtv.c:1.12 Sat Oct 27 13:18:31 2012
+++ src/sys/dev/pci/cxdtv.c Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtv.c,v 1.12 2012/10/27 17:18:31 chs Exp $ */
+/* $NetBSD: cxdtv.c,v 1.13 2013/10/16 18:20:16 christos Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.12 2012/10/27 17:18:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.13 2013/10/16 18:20:16 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -313,9 +313,6 @@ cxdtv_childdet(device_t self, device_t c
static bool
cxdtv_resume(device_t dv, const pmf_qual_t *qual)
{
- struct cxdtv_softc *sc;
- sc = device_private(dv);
-
/* XXX revisit */
aprint_debug_dev(dv, "%s\n", __func__);
@@ -353,11 +350,10 @@ static void
cxdtv_i2cbb_set_bits(void *cookie, uint32_t bits)
{
struct cxdtv_softc *sc = cookie;
- uint32_t value;
bus_space_write_4(sc->sc_memt, sc->sc_memh,
CXDTV_I2C_C_DATACONTROL, bits);
- value = bus_space_read_4(sc->sc_memt, sc->sc_memh,
+ (void)bus_space_read_4(sc->sc_memt, sc->sc_memh,
CXDTV_I2C_C_DATACONTROL);
return;
@@ -687,12 +683,10 @@ cxdtv_dtv_stop_transfer(void *priv)
int
cxdtv_mpeg_reset(struct cxdtv_softc *sc)
{
- struct cxdtv_sram_ch *ch;
uint32_t v;
CX_DPRINTF(("cxdtv_mpeg_reset\n"));
- ch = &cxdtv_sram_chs[CXDTV_SRAM_CH_MPEG];
v = (uint32_t)-1;
/* shutdown */
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.63 src/sys/dev/pci/eso.c:1.64
--- src/sys/dev/pci/eso.c:1.63 Wed Jul 17 17:26:29 2013
+++ src/sys/dev/pci/eso.c Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $ */
+/* $NetBSD: eso.c,v 1.64 2013/10/16 18:20:16 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.64 2013/10/16 18:20:16 christos Exp $");
#include "mpu.h"
@@ -1181,10 +1181,8 @@ static int
eso_get_port(void *hdl, mixer_ctrl_t *cp)
{
struct eso_softc *sc;
- int error;
sc = hdl;
- error = 0;
mutex_spin_enter(&sc->sc_intr_lock);
@@ -1224,7 +1222,6 @@ eso_get_port(void *hdl, mixer_ctrl_t *cp
sc->sc_gain[cp->dev][ESO_RIGHT];
break;
default:
- error = EINVAL;
break;
}
break;
@@ -1234,7 +1231,6 @@ eso_get_port(void *hdl, mixer_ctrl_t *cp
case ESO_MONO_REC_VOL:
case ESO_SPATIALIZER:
if (cp->un.value.num_channels != 1) {
- error = EINVAL;
break;
}
cp->un.value.level[AUDIO_MIXER_LEVEL_MONO] =
@@ -1273,7 +1269,6 @@ eso_get_port(void *hdl, mixer_ctrl_t *cp
break;
default:
- error = EINVAL;
break;
}
Index: src/sys/dev/pci/bktr/bktr_card.c
diff -u src/sys/dev/pci/bktr/bktr_card.c:1.24 src/sys/dev/pci/bktr/bktr_card.c:1.25
--- src/sys/dev/pci/bktr/bktr_card.c:1.24 Fri Oct 19 08:01:02 2007
+++ src/sys/dev/pci/bktr/bktr_card.c Wed Oct 16 14:20:16 2013
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_card.c,v 1.3 2003/03/11 23:11:21 thomasklausner Exp $ */
-/* $NetBSD: bktr_card.c,v 1.24 2007/10/19 12:01:02 ad Exp $ */
+/* $NetBSD: bktr_card.c,v 1.25 2013/10/16 18:20:16 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_card.c,v 1.24 2007/10/19 12:01:02 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_card.c,v 1.25 2013/10/16 18:20:16 christos Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -949,8 +949,8 @@ checkTuner:
if (bktr->card.eepromAddr != 0) {
/* eeprom data block structure */
unsigned char *block_1, *block_2, *block_3;
- int block_1_data_size, block_2_data_size, block_3_data_size;
- int block_1_total_size, block_2_total_size, block_3_total_size;
+ int block_1_data_size, block_2_data_size;
+ int block_1_total_size, block_2_total_size;
unsigned int model,revision;
unsigned char tuner_code;
@@ -968,8 +968,6 @@ checkTuner:
block_2_total_size = block_2_data_size + 3; /* Header bytes */
block_3 = &eeprom[block_1_total_size + block_2_total_size];
- block_3_data_size = (block_3[0] &0x07);
- block_3_total_size = block_3_data_size + 1; /* Header size */
model = (block_1[12] << 8 | block_1[11]);
revision = (block_1[15] << 16 | block_1[14] << 8 | block_1[13]);
Index: src/sys/dev/pci/hdaudio/hdaudio.c
diff -u src/sys/dev/pci/hdaudio/hdaudio.c:1.19 src/sys/dev/pci/hdaudio/hdaudio.c:1.20
--- src/sys/dev/pci/hdaudio/hdaudio.c:1.19 Wed Oct 16 14:13:00 2013
+++ src/sys/dev/pci/hdaudio/hdaudio.c Wed Oct 16 14:20:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.19 2013/10/16 18:13:00 christos Exp $ */
+/* $NetBSD: hdaudio.c,v 1.20 2013/10/16 18:20:17 christos Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.19 2013/10/16 18:13:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.20 2013/10/16 18:20:17 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -695,7 +695,7 @@ static void
hdaudio_codec_attach(struct hdaudio_codec *co)
{
struct hdaudio_function_group *fg;
- uint32_t vid, rid, snc, fgrp;
+ uint32_t vid, snc, fgrp;
int starting_node, num_nodes, nid;
if (co->co_valid == false)
