Module Name: src
Committed By: christos
Date: Sun Oct 20 21:13:15 UTC 2013
Modified Files:
src/sys/dev/acpi: acpi_verbose.c
src/sys/dev/ic: nslm7x.c
src/sys/fs/smbfs: smbfs_node.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.49 -r1.50 src/sys/fs/smbfs/smbfs_node.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/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.16 src/sys/dev/acpi/acpi_verbose.c:1.17
--- src/sys/dev/acpi/acpi_verbose.c:1.16 Mon Jan 3 03:50:23 2011
+++ src/sys/dev/acpi/acpi_verbose.c Sun Oct 20 17:13:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.16 2011/01/03 08:50:23 jruoho Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.17 2013/10/20 21:13:15 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2010 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.16 2011/01/03 08:50:23 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.17 2013/10/20 21:13:15 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -172,7 +172,6 @@ acpi_print_dev_real(const char *pnpstr)
static void
acpi_print_madt(struct acpi_softc *sc)
{
- ACPI_TABLE_MADT *madt;
ACPI_STATUS rv;
rv = acpi_madt_map();
@@ -183,7 +182,6 @@ acpi_print_madt(struct acpi_softc *sc)
if (madt_header == NULL)
return;
- madt = (ACPI_TABLE_MADT *)madt_header;
acpi_madt_walk(acpi_print_madt_callback, sc);
}
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.59 src/sys/dev/ic/nslm7x.c:1.60
--- src/sys/dev/ic/nslm7x.c:1.59 Sat Jan 21 10:50:13 2012
+++ src/sys/dev/ic/nslm7x.c Sun Oct 20 17:13:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.59 2012/01/21 15:50:13 jakllsch Exp $ */
+/* $NetBSD: nslm7x.c,v 1.60 2013/10/20 21:13:15 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.59 2012/01/21 15:50:13 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.60 2013/10/20 21:13:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1819,7 +1819,7 @@ static int
wb_match(struct lm_softc *sc)
{
const char *model = NULL;
- int banksel, vendid, devid, cf_flags;
+ int banksel, vendid, cf_flags;
aprint_naive("\n");
aprint_normal("\n");
@@ -1835,7 +1835,7 @@ wb_match(struct lm_softc *sc)
/* Read device/chip ID */
lm_generic_banksel(sc, WB_BANKSEL_B0);
- devid = (*sc->lm_readreg)(sc, LMD_CHIPID);
+ (void)(*sc->lm_readreg)(sc, LMD_CHIPID);
sc->chipid = (*sc->lm_readreg)(sc, WB_BANK0_CHIPID);
lm_generic_banksel(sc, banksel);
cf_flags = device_cfdata(sc->sc_dev)->cf_flags;
Index: src/sys/fs/smbfs/smbfs_node.c
diff -u src/sys/fs/smbfs/smbfs_node.c:1.49 src/sys/fs/smbfs/smbfs_node.c:1.50
--- src/sys/fs/smbfs/smbfs_node.c:1.49 Thu Nov 29 06:58:49 2012
+++ src/sys/fs/smbfs/smbfs_node.c Sun Oct 20 17:13:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.c,v 1.49 2012/11/29 11:58:49 nakayama Exp $ */
+/* $NetBSD: smbfs_node.c,v 1.50 2013/10/20 21:13:15 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.49 2012/11/29 11:58:49 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.50 2013/10/20 21:13:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@ smbfs_node_alloc(struct mount *mp, struc
struct vattr vattr;
struct smbmount *smp = VFSTOSMBFS(mp);
struct smbnode_hashhead *nhpp;
- struct smbnode *np, *np2, *dnp;
+ struct smbnode *np, *np2;
struct vnode *vp;
u_long hashval;
int error;
@@ -121,8 +121,8 @@ smbfs_node_alloc(struct mount *mp, struc
return (error);
}
- dnp = dvp ? VTOSMB(dvp) : NULL;
#ifdef DIAGNOSTIC
+ struct smbnode *dnp = dvp ? VTOSMB(dvp) : NULL;
if (dnp == NULL && dvp != NULL)
panic("smbfs_node_alloc: dead parent vnode %p", dvp);
#endif
