[src/netbsd-7]: src/sys/arch/arm/allwinner Pull up following revision(s) (req...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f46e67fb28dd
branches:  netbsd-7
changeset: 799088:f46e67fb28dd
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Mar 15 22:59:39 2015 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #595):
        sys/arch/arm/allwinner/awin_eth.c: revision 1.8
        sys/arch/arm/allwinner/awin_gige.c: revision 1.22
        sys/arch/arm/allwinner/awin_gpio.c: revision 1.17
        sys/arch/arm/allwinner/awin_usb.c: revision 1.20
sprinkle __diagused to fix "no options DIAGNOSTIC" build

diffstat:

 sys/arch/arm/allwinner/awin_eth.c  |  8 +++-----
 sys/arch/arm/allwinner/awin_gige.c |  8 +++-----
 sys/arch/arm/allwinner/awin_gpio.c |  6 +++---
 sys/arch/arm/allwinner/awin_usb.c  |  6 +++---
 4 files changed, 12 insertions(+), 16 deletions(-)

diffs (99 lines):

diff -r c819f3226262 -r f46e67fb28dd sys/arch/arm/allwinner/awin_eth.c
--- a/sys/arch/arm/allwinner/awin_eth.c Sun Mar 15 22:55:47 2015 +0000
+++ b/sys/arch/arm/allwinner/awin_eth.c Sun Mar 15 22:59:39 2015 +0000
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.5.2.1 2014/11/09 14:42:33 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.5.2.2 2015/03/15 22:59:39 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -141,10 +141,8 @@
 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];
 
diff -r c819f3226262 -r f46e67fb28dd sys/arch/arm/allwinner/awin_gige.c
--- a/sys/arch/arm/allwinner/awin_gige.c        Sun Mar 15 22:55:47 2015 +0000
+++ b/sys/arch/arm/allwinner/awin_gige.c        Sun Mar 15 22:59:39 2015 +0000
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.4.10.2 2014/11/25 08:03:06 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.4.10.3 2015/03/15 22:59:39 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -76,13 +76,11 @@
 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;
 
diff -r c819f3226262 -r f46e67fb28dd sys/arch/arm/allwinner/awin_gpio.c
--- a/sys/arch/arm/allwinner/awin_gpio.c        Sun Mar 15 22:55:47 2015 +0000
+++ b/sys/arch/arm/allwinner/awin_gpio.c        Sun Mar 15 22:59:39 2015 +0000
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.8.10.4 2014/11/25 08:03:06 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.8.10.5 2015/03/15 22:59:39 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -243,8 +243,8 @@
 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);
diff -r c819f3226262 -r f46e67fb28dd sys/arch/arm/allwinner/awin_usb.c
--- a/sys/arch/arm/allwinner/awin_usb.c Sun Mar 15 22:55:47 2015 +0000
+++ b/sys/arch/arm/allwinner/awin_usb.c Sun Mar 15 22:59:39 2015 +0000
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.12.2.2 2014/11/20 10:05:06 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.12.2.3 2015/03/15 22:59:39 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -354,8 +354,8 @@
 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));