[src/trunk]: src/sys/dev "return f(); " where both f and the enclosing functio...

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

details:   https://anonhg.NetBSD.org/src/rev/68609d3db913
branches:  trunk
changeset: 770399:68609d3db913
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Oct 15 19:50:20 2011 +0000

description:
"return f();" where both f and the enclosing function return void is
sometimes convenient. But, it's not standard, so don't do it.

diffstat:

 sys/dev/ic/bwivar.h  |   4 ++--
 sys/dev/pci/if_sip.c |  10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 659726ba1198 -r 68609d3db913 sys/dev/ic/bwivar.h
--- a/sys/dev/ic/bwivar.h       Sat Oct 15 19:02:27 2011 +0000
+++ b/sys/dev/ic/bwivar.h       Sat Oct 15 19:50:20 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bwivar.h,v 1.7 2010/02/24 22:37:58 dyoung Exp $        */
+/*     $NetBSD: bwivar.h,v 1.8 2011/10/15 19:50:20 dholland Exp $      */
 /*     $OpenBSD: bwivar.h,v 1.23 2008/02/25 20:36:54 mglocker Exp $    */
 
 /*
@@ -770,7 +770,7 @@
 static __inline void
 bwi_rf_lo_update(struct bwi_mac *_mac)
 {
-       return (_mac->mac_rf.rf_lo_update(_mac));
+       _mac->mac_rf.rf_lo_update(_mac);
 }
 
 #define RF_WRITE(mac, ofs, val)                bwi_rf_write((mac), (ofs), (val))
diff -r 659726ba1198 -r 68609d3db913 sys/dev/pci/if_sip.c
--- a/sys/dev/pci/if_sip.c      Sat Oct 15 19:02:27 2011 +0000
+++ b/sys/dev/pci/if_sip.c      Sat Oct 15 19:50:20 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sip.c,v 1.149 2010/11/13 13:52:06 uebayasi Exp $    */
+/*     $NetBSD: if_sip.c,v 1.150 2011/10/15 19:50:20 dholland Exp $    */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.149 2010/11/13 13:52:06 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.150 2011/10/15 19:50:20 dholland Exp $");
 
 #include "rnd.h"
 
@@ -1110,7 +1110,8 @@
                if (intrstr != NULL)
                        aprint_error(" at %s", intrstr);
                aprint_error("\n");
-               return sipcom_do_detach(self, SIP_ATTACH_MAP);
+               sipcom_do_detach(self, SIP_ATTACH_MAP);
+               return;
        }
        aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr);
 
@@ -1126,7 +1127,8 @@
            &rseg, 0)) != 0) {
                aprint_error_dev(sc->sc_dev, "unable to allocate control data, error = %d\n",
                    error);
-               return sipcom_do_detach(self, SIP_ATTACH_INTR);
+               sipcom_do_detach(self, SIP_ATTACH_INTR);
+               return;
        }
 
        if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_seg, rseg,