Module Name: src
Committed By: christos
Date: Sat Nov 9 02:54:11 UTC 2013
Modified Files:
src/sys/arch/hpcsh/dev: psh3lcd.c
src/sys/arch/hpcsh/dev/hd64461: hd64461_machdep.c hd64461pcmcia.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcsh/dev/psh3lcd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.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/hpcsh/dev/psh3lcd.c
diff -u src/sys/arch/hpcsh/dev/psh3lcd.c:1.6 src/sys/arch/hpcsh/dev/psh3lcd.c:1.7
--- src/sys/arch/hpcsh/dev/psh3lcd.c:1.6 Sun Feb 12 11:34:08 2012
+++ src/sys/arch/hpcsh/dev/psh3lcd.c Fri Nov 8 21:54:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: psh3lcd.c,v 1.6 2012/02/12 16:34:08 matt Exp $ */
+/* $NetBSD: psh3lcd.c,v 1.7 2013/11/09 02:54:11 christos Exp $ */
/*
* Copyright (c) 2005 KIYOHARA Takashi
* All rights reserved.
@@ -249,13 +249,13 @@ static void
psh3lcd_attach(device_t parent __unused, device_t self, void *aux __unused)
{
struct psh3lcd_softc *sc = device_private(self);
- uint8_t bcr0, bcr1, bcr2;
+ uint8_t bcr0;
sc->sc_dev = self;
bcr0 = _reg_read_1(PSH3LCD_BRIGHTNESS_REG0);
- bcr1 = _reg_read_1(PSH3LCD_BRIGHTNESS_REG1);
- bcr2 = _reg_read_1(PSH3LCD_BRIGHTNESS_REG2);
+ (void)_reg_read_1(PSH3LCD_BRIGHTNESS_REG1);
+ (void)_reg_read_1(PSH3LCD_BRIGHTNESS_REG2);
if (bcr0 == 0) {
sc->sc_set_brightness = psh3lcd_xx0_set_brightness;
sc->sc_brightness = psh3lcd_xx0_bcd_get();
Index: src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.6 src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.7
--- src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.6 Tue Jul 19 11:30:52 2011
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c Fri Nov 8 21:54:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461_machdep.c,v 1.6 2011/07/19 15:30:52 dyoung Exp $ */
+/* $NetBSD: hd64461_machdep.c,v 1.7 2013/11/09 02:54:11 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461_machdep.c,v 1.6 2011/07/19 15:30:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461_machdep.c,v 1.7 2013/11/09 02:54:11 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,10 +74,10 @@ do { \
r &= ~HD64461_PCCSCR_VCC1; \
hd64461_reg_write_1(scr, r); \
} while (/*CONSTCOND*/0)
- bus_addr_t isr, gcr, scr;
+ bus_addr_t gcr, scr;
uint8_t r;
- isr = HD64461_PCCISR(ch);
+ (void)HD64461_PCCISR(ch);
gcr = HD64461_PCCGCR(ch);
scr = HD64461_PCCSCR(ch);
Index: src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.50 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.51
--- src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.50 Sun Oct 13 02:55:34 2013
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Fri Nov 8 21:54:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $ */
+/* $NetBSD: hd64461pcmcia.c,v 1.51 2013/11/09 02:54:11 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.51 2013/11/09 02:54:11 christos Exp $");
#include "opt_hd64461pcmcia.h"
@@ -251,7 +251,7 @@ hd64461pcmcia_attach(device_t parent, de
{
struct hd64461_attach_args *ha = aux;
struct hd64461pcmcia_softc *sc;
- int error;
+ int error __diagused;
sc = device_private(self);
sc->sc_dev = self;
@@ -893,11 +893,11 @@ hd64461pcmcia_power_on(enum controller_c
{
uint8_t r;
uint16_t r16;
- bus_addr_t scr, gcr, isr;
+ bus_addr_t gcr, isr;
isr = HD64461_PCCISR(channel);
gcr = HD64461_PCCGCR(channel);
- scr = HD64461_PCCSCR(channel);
+ (void)HD64461_PCCSCR(channel);
/*
* XXX to access attribute memory, this is required.