Module Name: src
Committed By: jmcneill
Date: Sun Mar 15 13:15:26 UTC 2015
Modified Files:
src/sys/arch/arm/allwinner: awin_eth.c awin_gige.c awin_gpio.c
awin_usb.c
Log Message:
sprinkle __diagused to fix "no options DIAGNOSTIC" build
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/allwinner/awin_eth.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/allwinner/awin_gige.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/allwinner/awin_usb.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/arm/allwinner/awin_eth.c
diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.7 src/sys/arch/arm/allwinner/awin_eth.c:1.8
--- src/sys/arch/arm/allwinner/awin_eth.c:1.7 Sat Sep 6 19:00:50 2014
+++ src/sys/arch/arm/allwinner/awin_eth.c Sun Mar 15 13:15:26 2015
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.7 2014/09/06 19:00:50 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.8 2015/03/15 13:15:26 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -141,10 +141,8 @@ awin_eth_clear_set(struct awin_eth_softc
static int
awin_eth_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
-#ifdef DIAGNOSTIC
- const struct awin_locators * const loc = &aio->aio_loc;
-#endif
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
const struct awin_gpio_pinset * const pinset =
&awin_eth_pinsets[cf->cf_flags & 1];
Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.21 src/sys/arch/arm/allwinner/awin_gige.c:1.22
--- src/sys/arch/arm/allwinner/awin_gige.c:1.21 Sun Dec 7 00:37:52 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c Sun Mar 15 13:15:26 2015
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.21 2014/12/07 00:37:52 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.22 2015/03/15 13:15:26 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -90,13 +90,11 @@ CFATTACH_DECL_NEW(awin_gige, sizeof(stru
static int
awin_gige_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
const struct awin_gpio_pinset *pinset =
awin_chip_id() == AWIN_CHIP_ID_A31 ?
&awin_gige_gpio_pinset_a31 : &awin_gige_gpio_pinset;
-#ifdef DIAGNOSTIC
- const struct awin_locators * const loc = &aio->aio_loc;
-#endif
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
if (cf->cf_flags & 1)
return 0;
Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.16 src/sys/arch/arm/allwinner/awin_gpio.c:1.17
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.16 Sun Dec 7 18:32:13 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c Sun Mar 15 13:15:26 2015
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.16 2014/12/07 18:32:13 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.17 2015/03/15 13:15:26 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -254,8 +254,8 @@ CFATTACH_DECL_NEW(awin_gpio, sizeof(stru
static int
awin_gpio_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
- const struct awin_locators * const loc = &aio->aio_loc;
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
KASSERT(!strcmp(cf->cf_name, loc->loc_name));
KASSERT(loc->loc_port == AWINIOCF_PORT_DEFAULT);
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.19 src/sys/arch/arm/allwinner/awin_usb.c:1.20
--- src/sys/arch/arm/allwinner/awin_usb.c:1.19 Sun Dec 7 16:20:33 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c Sun Mar 15 13:15:26 2015
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.19 2014/12/07 16:20:33 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.20 2015/03/15 13:15:26 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -403,8 +403,8 @@ static const uint32_t awinusb_usb_pcr_a8
int
awinusb_match(device_t parent, cfdata_t cf, void *aux)
{
- struct awinio_attach_args * const aio = aux;
- const struct awin_locators * const loc = &aio->aio_loc;
+ struct awinio_attach_args * const aio __diagused = aux;
+ const struct awin_locators * const loc __diagused = &aio->aio_loc;
KASSERT(loc->loc_port != AWINIOCF_PORT_DEFAULT);
KASSERT(!strcmp(cf->cf_name, loc->loc_name));
