Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:45:28 UTC 2010
Modified Files:
src/sys/arch/i386/pci: elan520.c piixpcib.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/pci/elan520.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/pci/piixpcib.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/i386/pci/elan520.c
diff -u src/sys/arch/i386/pci/elan520.c:1.45 src/sys/arch/i386/pci/elan520.c:1.46
--- src/sys/arch/i386/pci/elan520.c:1.45 Fri Jan 8 00:09:44 2010
+++ src/sys/arch/i386/pci/elan520.c Fri Jan 8 19:45:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $ */
+/* $NetBSD: elan520.c,v 1.46 2010/01/08 19:45:28 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.46 2010/01/08 19:45:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -847,7 +847,7 @@
}
static bool
-elansc_suspend(device_t dev PMF_FN_ARGS)
+elansc_suspend(device_t dev, pmf_qual_t qual)
{
bool rc;
struct elansc_softc *sc = device_private(dev);
@@ -861,7 +861,7 @@
}
static bool
-elansc_resume(device_t dev PMF_FN_ARGS)
+elansc_resume(device_t dev, pmf_qual_t qual)
{
struct elansc_softc *sc = device_private(dev);
@@ -947,7 +947,7 @@
}
static bool
-elanpex_resume(device_t self PMF_FN_ARGS)
+elanpex_resume(device_t self, pmf_qual_t qual)
{
struct elansc_softc *sc = device_private(device_parent(self));
@@ -956,7 +956,7 @@
}
static bool
-elanpex_suspend(device_t self PMF_FN_ARGS)
+elanpex_suspend(device_t self, pmf_qual_t qual)
{
struct elansc_softc *sc = device_private(device_parent(self));
@@ -966,7 +966,7 @@
}
static bool
-elanpar_resume(device_t self PMF_FN_ARGS)
+elanpar_resume(device_t self, pmf_qual_t qual)
{
struct elansc_softc *sc = device_private(device_parent(self));
@@ -975,7 +975,7 @@
}
static bool
-elanpar_suspend(device_t self PMF_FN_ARGS)
+elanpar_suspend(device_t self, pmf_qual_t qual)
{
struct elansc_softc *sc = device_private(device_parent(self));
Index: src/sys/arch/i386/pci/piixpcib.c
diff -u src/sys/arch/i386/pci/piixpcib.c:1.16 src/sys/arch/i386/pci/piixpcib.c:1.17
--- src/sys/arch/i386/pci/piixpcib.c:1.16 Sun Jul 20 16:52:33 2008
+++ src/sys/arch/i386/pci/piixpcib.c Fri Jan 8 19:45:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $ */
+/* $NetBSD: piixpcib.c,v 1.17 2010/01/08 19:45:28 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.17 2010/01/08 19:45:28 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -79,8 +79,8 @@
static int piixpcibmatch(device_t, cfdata_t, void *);
static void piixpcibattach(device_t, device_t, void *);
-static bool piixpcib_suspend(device_t PMF_FN_PROTO);
-static bool piixpcib_resume(device_t PMF_FN_PROTO);
+static bool piixpcib_suspend(device_t, pmf_qual_t);
+static bool piixpcib_resume(device_t, pmf_qual_t);
static void speedstep_configure(struct piixpcib_softc *,
struct pci_attach_args *);
@@ -144,7 +144,7 @@
}
static bool
-piixpcib_suspend(device_t dv PMF_FN_ARGS)
+piixpcib_suspend(device_t dv, pmf_qual_t qual)
{
struct piixpcib_softc *sc = device_private(dv);
@@ -160,7 +160,7 @@
}
static bool
-piixpcib_resume(device_t dv PMF_FN_ARGS)
+piixpcib_resume(device_t dv, pmf_qual_t qual)
{
struct piixpcib_softc *sc = device_private(dv);
