Module Name: src
Committed By: dholland
Date: Sat Oct 15 19:50:20 UTC 2011
Modified Files:
src/sys/dev/ic: bwivar.h
src/sys/dev/pci: if_sip.c
Log Message:
"return f();" where both f and the enclosing function return void is
sometimes convenient. But, it's not standard, so don't do it.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/bwivar.h
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/pci/if_sip.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/dev/ic/bwivar.h
diff -u src/sys/dev/ic/bwivar.h:1.7 src/sys/dev/ic/bwivar.h:1.8
--- src/sys/dev/ic/bwivar.h:1.7 Wed Feb 24 22:37:58 2010
+++ src/sys/dev/ic/bwivar.h Sat Oct 15 19:50:20 2011
@@ -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 @@ bwi_rf_calc_rssi(struct bwi_mac *_mac, c
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))
Index: src/sys/dev/pci/if_sip.c
diff -u src/sys/dev/pci/if_sip.c:1.149 src/sys/dev/pci/if_sip.c:1.150
--- src/sys/dev/pci/if_sip.c:1.149 Sat Nov 13 13:52:06 2010
+++ src/sys/dev/pci/if_sip.c Sat Oct 15 19:50:20 2011
@@ -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 @@ sipcom_attach(device_t parent, device_t
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 @@ sipcom_attach(device_t parent, device_t
&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,
