Module Name: src
Committed By: tsutsui
Date: Sat Sep 5 14:50:10 UTC 2009
Modified Files:
src/sys/dev/cardbus: if_ath_cardbus.c if_fxp_cardbus.c if_rtk_cardbus.c
if_rtw_cardbus.c
Log Message:
Invert logic around nested pmf(9) registrations for readability.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/if_rtw_cardbus.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/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.33 src/sys/dev/cardbus/if_ath_cardbus.c:1.34
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.33 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/if_ath_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.34 2009/09/05 14:50:10 tsutsui Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.34 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -215,12 +215,12 @@
if (ath_attach(PCI_PRODUCT(ca->ca_id), sc) != 0)
return;
- if (!pmf_device_register(self, ath_cardbus_suspend, ath_cardbus_resume))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else {
+ if (pmf_device_register(self,
+ ath_cardbus_suspend, ath_cardbus_resume)) {
pmf_class_network_register(self, &sc->sc_if);
pmf_device_suspend_self(self);
- }
+ } else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
int
Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.39 src/sys/dev/cardbus/if_fxp_cardbus.c:1.40
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.39 Tue May 12 14:17:31 2009
+++ src/sys/dev/cardbus/if_fxp_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.39 2009/05/12 14:17:31 cegger Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.40 2009/09/05 14:50:10 tsutsui Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.39 2009/05/12 14:17:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.40 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -183,10 +183,10 @@
fxp_attach(sc);
fxp_disable(sc);
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, &sc->sc_ethercom.ec_if);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
static void
Index: src/sys/dev/cardbus/if_rtk_cardbus.c
diff -u src/sys/dev/cardbus/if_rtk_cardbus.c:1.37 src/sys/dev/cardbus/if_rtk_cardbus.c:1.38
--- src/sys/dev/cardbus/if_rtk_cardbus.c:1.37 Tue Jun 24 19:44:52 2008
+++ src/sys/dev/cardbus/if_rtk_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.37 2008/06/24 19:44:52 drochner Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.38 2009/09/05 14:50:10 tsutsui Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.37 2008/06/24 19:44:52 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.38 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -246,10 +246,10 @@
rtk_attach(sc);
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, &sc->ethercom.ec_if);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
/*
* Power down the socket.
Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.29 src/sys/dev/cardbus/if_rtw_cardbus.c:1.30
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.29 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/if_rtw_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.30 2009/09/05 14:50:10 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.30 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -296,15 +296,15 @@
RTW_WRITE(regs, RTW_FEMR, 0);
RTW_WRITE(regs, RTW_FER, RTW_READ(regs, RTW_FER));
- if (!pmf_device_register(self, rtw_cardbus_suspend, rtw_cardbus_resume))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else {
+ if (pmf_device_register(self,
+ rtw_cardbus_suspend, rtw_cardbus_resume)) {
pmf_class_network_register(self, &sc->sc_if);
/*
* Power down the socket.
*/
pmf_device_suspend_self(self);
- }
+ } else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
int
