Use PMF_FN_ARGS, PMF_FN_PROTO. trunk
authordyoung <dyoung@NetBSD.org>
Fri, 29 Feb 2008 06:25:08 +0000
branchtrunk
changeset 167437 0a3fd3c0a3bd
parent 167436 f25fefb67832
child 167438 ea130af02bd1
Use PMF_FN_ARGS, PMF_FN_PROTO.
sys/arch/i386/pci/elan520.c
sys/arch/i386/pci/piixpcib.c
sys/arch/x86/pci/ichlpcib.c
sys/arch/x86/pci/pchb.c
sys/arch/x86/x86/cpu.c
--- a/sys/arch/i386/pci/elan520.c	Fri Feb 29 06:13:39 2008 +0000
+++ b/sys/arch/i386/pci/elan520.c	Fri Feb 29 06:25:08 2008 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: elan520.c,v 1.23 2008/02/18 06:26:42 dyoung Exp $	*/
+/*	$NetBSD: elan520.c,v 1.24 2008/02/29 06:25:08 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.23 2008/02/18 06:26:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.24 2008/02/29 06:25:08 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -623,7 +623,7 @@
 }
 
 static bool
-elansc_suspend(device_t dev)
+elansc_suspend(device_t dev PMF_FN_ARGS)
 {
 	bool rc;
 	struct elansc_softc *sc = device_private(dev);
@@ -637,7 +637,7 @@
 }
 
 static bool
-elansc_resume(device_t dev)
+elansc_resume(device_t dev PMF_FN_ARGS)
 {
 	struct elansc_softc *sc = device_private(dev);
 
@@ -705,7 +705,7 @@
 }
 
 static bool
-elanpex_resume(device_t self)
+elanpex_resume(device_t self PMF_FN_ARGS)
 {
 	struct elansc_softc *sc = device_private(device_parent(self));
 
@@ -714,7 +714,7 @@
 }
 
 static bool
-elanpex_suspend(device_t self)
+elanpex_suspend(device_t self PMF_FN_ARGS)
 {
 	struct elansc_softc *sc = device_private(device_parent(self));
 
@@ -724,7 +724,7 @@
 }
 
 static bool
-elanpar_resume(device_t self)
+elanpar_resume(device_t self PMF_FN_ARGS)
 {
 	struct elansc_softc *sc = device_private(device_parent(self));
 
@@ -733,7 +733,7 @@
 }
 
 static bool
-elanpar_suspend(device_t self)
+elanpar_suspend(device_t self PMF_FN_ARGS)
 {
 	struct elansc_softc *sc = device_private(device_parent(self));
 
--- a/sys/arch/i386/pci/piixpcib.c	Fri Feb 29 06:13:39 2008 +0000
+++ b/sys/arch/i386/pci/piixpcib.c	Fri Feb 29 06:25:08 2008 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpcib.c,v 1.11 2007/12/09 20:27:48 jmcneill Exp $ */
+/* $NetBSD: piixpcib.c,v 1.12 2008/02/29 06:25:08 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.11 2007/12/09 20:27:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.12 2008/02/29 06:25:08 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -84,8 +84,8 @@
 static int piixpcibmatch(struct device *, struct cfdata *, void *);
 static void piixpcibattach(struct device *, struct device *, void *);
 
-static bool piixpcib_suspend(device_t);
-static bool piixpcib_resume(device_t);
+static bool piixpcib_suspend(device_t PMF_FN_PROTO);
+static bool piixpcib_resume(device_t PMF_FN_PROTO);
 
 static void speedstep_configure(struct piixpcib_softc *,
 				struct pci_attach_args *);
@@ -162,7 +162,7 @@
 }
 
 static bool
-piixpcib_suspend(device_t dv)
+piixpcib_suspend(device_t dv PMF_FN_ARGS)
 {
 	struct piixpcib_softc *sc = device_private(dv);
 
@@ -177,7 +177,7 @@
 }
 
 static bool
-piixpcib_resume(device_t dv)
+piixpcib_resume(device_t dv PMF_FN_ARGS)
 {
 	struct piixpcib_softc *sc = device_private(dv);
 
--- a/sys/arch/x86/pci/ichlpcib.c	Fri Feb 29 06:13:39 2008 +0000
+++ b/sys/arch/x86/pci/ichlpcib.c	Fri Feb 29 06:25:08 2008 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichlpcib.c,v 1.7 2008/01/15 00:24:47 drochner Exp $	*/
+/*	$NetBSD: ichlpcib.c,v 1.8 2008/02/29 06:27:15 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.7 2008/01/15 00:24:47 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.8 2008/02/29 06:27:15 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -103,8 +103,8 @@
 
 static int lpcibmatch(struct device *, struct cfdata *, void *);
 static void lpcibattach(struct device *, struct device *, void *);
-static bool lpcib_suspend(device_t);
-static bool lpcib_resume(device_t);
+static bool lpcib_suspend(device_t PMF_FN_PROTO);
+static bool lpcib_resume(device_t PMF_FN_PROTO);
 
 static void pmtimer_configure(struct lpcib_softc *);
 
@@ -260,7 +260,7 @@
 }
 
 static bool
-lpcib_suspend(device_t dv)
+lpcib_suspend(device_t dv PMF_FN_ARGS)
 {
 	struct lpcib_softc *sc = device_private(dv);
 	pci_chipset_tag_t pc = sc->sc_pc;
@@ -289,7 +289,7 @@
 }
 
 static bool
-lpcib_resume(device_t dv)
+lpcib_resume(device_t dv PMF_FN_ARGS)
 {
 	struct lpcib_softc *sc = device_private(dv);
 	pci_chipset_tag_t pc = sc->sc_pc;
--- a/sys/arch/x86/pci/pchb.c	Fri Feb 29 06:13:39 2008 +0000
+++ b/sys/arch/x86/pci/pchb.c	Fri Feb 29 06:25:08 2008 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.7 2008/02/28 18:51:18 drochner Exp $ */
+/*	$NetBSD: pchb.c,v 1.8 2008/02/29 06:27:15 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.7 2008/02/28 18:51:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.8 2008/02/29 06:27:15 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -82,8 +82,8 @@
 void	pchbattach(struct device *, struct device *, void *);
 int	pchbdetach(device_t, int);
 
-static bool	pchb_resume(device_t);
-static bool	pchb_suspend(device_t);
+static bool	pchb_resume(device_t PMF_FN_ARGS);
+static bool	pchb_suspend(device_t PMF_FN_ARGS);
 
 CFATTACH_DECL(pchb, sizeof(struct pchb_softc),
     pchbmatch, pchbattach, pchbdetach, NULL);
@@ -408,7 +408,7 @@
 }
 
 static bool
-pchb_suspend(device_t dv)
+pchb_suspend(device_t dv PMF_FN_ARGS)
 {
 	struct pchb_softc *sc = device_private(dv);
 	pci_chipset_tag_t pc;
@@ -425,7 +425,7 @@
 }
 
 static bool
-pchb_resume(device_t dv)
+pchb_resume(device_t dv PMF_FN_ARGS)
 {
 	struct pchb_softc *sc = device_private(dv);
 	pci_chipset_tag_t pc;
--- a/sys/arch/x86/x86/cpu.c	Fri Feb 29 06:13:39 2008 +0000
+++ b/sys/arch/x86/x86/cpu.c	Fri Feb 29 06:25:08 2008 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.21 2008/02/10 14:37:41 ad Exp $	*/
+/*	$NetBSD: cpu.c,v 1.22 2008/02/29 06:27:15 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21 2008/02/10 14:37:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2008/02/29 06:27:15 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -123,8 +123,8 @@
 int     cpu_match(struct device *, struct cfdata *, void *);
 void    cpu_attach(struct device *, struct device *, void *);
 
-static bool	cpu_suspend(device_t);
-static bool	cpu_resume(device_t);
+static bool	cpu_suspend(device_t PMF_FN_PROTO);
+static bool	cpu_resume(device_t PMF_FN_PROTO);
 
 struct cpu_softc {
 	struct device sc_dev;		/* device tree glue */
@@ -921,7 +921,7 @@
 
 /* XXX joerg restructure and restart CPUs individually */
 static bool
-cpu_suspend(device_t dv)
+cpu_suspend(device_t dv PMF_FN_ARGS)
 {
 	struct cpu_softc *sc = device_private(dv);
 	struct cpu_info *ci = sc->sc_info;
@@ -949,7 +949,7 @@
 }
 
 static bool
-cpu_resume(device_t dv)
+cpu_resume(device_t dv PMF_FN_ARGS)
 {
 	struct cpu_softc *sc = device_private(dv);
 	struct cpu_info *ci = sc->sc_info;