Module Name: src
Committed By: mrg
Date: Mon Dec 16 15:45:29 UTC 2013
Modified Files:
src/sys/arch/sgimips/dev: crmfb.c
src/sys/arch/sgimips/mace: mace.c mcclock_mace.c
src/sys/arch/sgimips/sgimips: autoconf.c machdep.c
Log Message:
- remove unused variables
- use (void) when we don't care about the return value
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sgimips/dev/crmfb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/mace/mace.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/mace/mcclock_mace.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sgimips/sgimips/autoconf.c
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/sgimips/sgimips/machdep.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/arch/sgimips/dev/crmfb.c
diff -u src/sys/arch/sgimips/dev/crmfb.c:1.36 src/sys/arch/sgimips/dev/crmfb.c:1.37
--- src/sys/arch/sgimips/dev/crmfb.c:1.36 Wed Jan 11 16:18:30 2012
+++ src/sys/arch/sgimips/dev/crmfb.c Mon Dec 16 15:45:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crmfb.c,v 1.36 2012/01/11 16:18:30 macallan Exp $ */
+/* $NetBSD: crmfb.c,v 1.37 2013/12/16 15:45:29 mrg Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.36 2012/01/11 16:18:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.37 2013/12/16 15:45:29 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -419,13 +419,11 @@ crmfb_ioctl(void *v, void *vs, u_long cm
{
struct vcons_data *vd;
struct crmfb_softc *sc;
- struct vcons_screen *ms;
struct wsdisplay_fbinfo *wdf;
int nmode;
vd = (struct vcons_data *)v;
sc = (struct crmfb_softc *)vd->cookie;
- ms = (struct vcons_screen *)vd->active;
switch (cmd) {
case WSDISPLAYIO_GTYPE:
Index: src/sys/arch/sgimips/mace/mace.c
diff -u src/sys/arch/sgimips/mace/mace.c:1.19 src/sys/arch/sgimips/mace/mace.c:1.20
--- src/sys/arch/sgimips/mace/mace.c:1.19 Sat Oct 27 17:18:10 2012
+++ src/sys/arch/sgimips/mace/mace.c Mon Dec 16 15:45:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mace.c,v 1.19 2012/10/27 17:18:10 chs Exp $ */
+/* $NetBSD: mace.c,v 1.20 2013/12/16 15:45:29 mrg Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.19 2012/10/27 17:18:10 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.20 2013/12/16 15:45:29 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -295,13 +295,11 @@ mace_intr_disestablish(void *cookie)
void
mace_intr(int irqs)
{
- uint64_t isa_irq, isa_mask;
+ uint64_t isa_irq;
int i;
/* irq 4 is the ISA cascade interrupt. Must handle with care. */
if (irqs & (1 << 4)) {
- isa_mask = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(MACE_BASE
- + MACE_ISA_INT_MASK));
isa_irq = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(MACE_BASE
+ MACE_ISA_INT_STATUS));
for (i = 0; i < MACE_NINTR; i++) {
Index: src/sys/arch/sgimips/mace/mcclock_mace.c
diff -u src/sys/arch/sgimips/mace/mcclock_mace.c:1.14 src/sys/arch/sgimips/mace/mcclock_mace.c:1.15
--- src/sys/arch/sgimips/mace/mcclock_mace.c:1.14 Fri Jul 1 18:53:47 2011
+++ src/sys/arch/sgimips/mace/mcclock_mace.c Mon Dec 16 15:45:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_mace.c,v 1.14 2011/07/01 18:53:47 dyoung Exp $ */
+/* $NetBSD: mcclock_mace.c,v 1.15 2013/12/16 15:45:29 mrg Exp $ */
/*
* Copyright (c) 2001 Antti Kantee. All Rights Reserved.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.14 2011/07/01 18:53:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.15 2013/12/16 15:45:29 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,13 +226,12 @@ mcclock_mace_settime_ymdhms(todr_chip_ha
void
mcclock_poweroff(void)
{
- int s;
uint8_t a, xctl_a, xctl_b;
if (mace0 == NULL)
return;
- s = splhigh();
+ (void)splhigh();
a = ds1687_read(mace0, DS1687_CONTROLA);
a &= ~DS1687_DV2;
a |= DS1687_DV1;
Index: src/sys/arch/sgimips/sgimips/autoconf.c
diff -u src/sys/arch/sgimips/sgimips/autoconf.c:1.44 src/sys/arch/sgimips/sgimips/autoconf.c:1.45
--- src/sys/arch/sgimips/sgimips/autoconf.c:1.44 Sat Oct 27 17:18:10 2012
+++ src/sys/arch/sgimips/sgimips/autoconf.c Mon Dec 16 15:45:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.44 2012/10/27 17:18:10 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.45 2013/12/16 15:45:29 mrg Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.44 2012/10/27 17:18:10 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.45 2013/12/16 15:45:29 mrg Exp $");
#include "opt_ddb.h"
@@ -64,9 +64,8 @@ extern struct platform platform;
void
cpu_configure(void)
{
- int s;
- s = splhigh();
+ (void)splhigh();
if (config_rootfound("mainbus", NULL) == NULL)
panic("no mainbus found");
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.138 src/sys/arch/sgimips/sgimips/machdep.c:1.139
--- src/sys/arch/sgimips/sgimips/machdep.c:1.138 Sat Oct 27 17:18:10 2012
+++ src/sys/arch/sgimips/sgimips/machdep.c Mon Dec 16 15:45:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.138 2012/10/27 17:18:10 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.139 2013/12/16 15:45:29 mrg Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.138 2012/10/27 17:18:10 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.139 2013/12/16 15:45:29 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -246,7 +246,6 @@ mach_init(int argc, int32_t argv32[], ui
const char *cpufreq, *osload;
char *bootpath = NULL;
vaddr_t kernend;
- int kernstartpfn, kernendpfn;
u_int i;
int rv;
#if NKSYMS > 0 || defined(DDB) || defined(MODULAR)
@@ -324,12 +323,6 @@ mach_init(int argc, int32_t argv32[], ui
kernend = mips_round_page(end);
}
- /* Leave 1 page before kernel untouched as that's where our initial
- * kernel stack is */
- /* XXX We could free it in cpu_startup() though XXX */
- kernstartpfn = atop(MIPS_KSEG0_TO_PHYS((vaddr_t) kernel_text)) - 1;
- kernendpfn = atop(MIPS_KSEG0_TO_PHYS(kernend));
-
cpufreq = arcbios_GetEnvironmentVariable("cpufreq");
if (cpufreq == 0)
@@ -630,6 +623,9 @@ mach_init(int argc, int32_t argv32[], ui
if (mem_cluster_cnt == 0)
panic("no free memory descriptors found");
+ /* Leave 1 page before kernel untouched as that's where our initial
+ * kernel stack is */
+ /* XXX We could free it in cpu_startup() though XXX */
mips_page_physload((vaddr_t)kernel_text - PAGE_SIZE, (vaddr_t)kernend,
mem_clusters, mem_cluster_cnt, NULL, 0);
