CVS commit: src/sys/dev/ata

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Fri Jan  8 19:48:12 UTC 2010

Modified Files:
        src/sys/dev/ata: ata.c wd.c

Log Message:
Expand PMF_FN_* macros.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.380 -r1.381 src/sys/dev/ata/wd.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.109 src/sys/dev/ata/ata.c:1.110
--- src/sys/dev/ata/ata.c:1.109	Thu Nov 12 19:20:08 2009
+++ src/sys/dev/ata/ata.c	Fri Jan  8 19:48:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.109 2009/11/12 19:20:08 dyoung Exp $	*/
+/*	$NetBSD: ata.c,v 1.110 2010/01/08 19:48:11 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.109 2009/11/12 19:20:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.110 2010/01/08 19:48:11 dyoung Exp $");
 
 #include "opt_ata.h"
 
@@ -106,8 +106,8 @@
 extern struct cfdriver atabus_cd;
 
 static void atabus_childdetached(device_t, device_t);
-static bool atabus_resume(device_t PMF_FN_PROTO);
-static bool atabus_suspend(device_t PMF_FN_PROTO);
+static bool atabus_resume(device_t, pmf_qual_t);
+static bool atabus_suspend(device_t, pmf_qual_t);
 static void atabusconfig_thread(void *);
 
 /*
@@ -1525,7 +1525,7 @@
 };
 
 static bool
-atabus_suspend(device_t dv PMF_FN_ARGS)
+atabus_suspend(device_t dv, pmf_qual_t qual)
 {
 	struct atabus_softc *sc = device_private(dv);
 	struct ata_channel *chp = sc->sc_chan;
@@ -1536,7 +1536,7 @@
 }
 
 static bool
-atabus_resume(device_t dv PMF_FN_ARGS)
+atabus_resume(device_t dv, pmf_qual_t qual)
 {
 	struct atabus_softc *sc = device_private(dv);
 	struct ata_channel *chp = sc->sc_chan;

Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.380 src/sys/dev/ata/wd.c:1.381
--- src/sys/dev/ata/wd.c:1.380	Thu Dec 17 21:03:10 2009
+++ src/sys/dev/ata/wd.c	Fri Jan  8 19:48:12 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.380 2009/12/17 21:03:10 bouyer Exp $ */
+/*	$NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.380 2009/12/17 21:03:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $");
 
 #include "opt_ata.h"
 
@@ -126,7 +126,7 @@
 void	wdperror(const struct wd_softc *);
 
 static int	wdlastclose(device_t);
-static bool	wd_suspend(device_t PMF_FN_PROTO);
+static bool	wd_suspend(device_t, pmf_qual_t);
 static int	wd_standby(struct wd_softc *, int);
 
 CFATTACH_DECL3_NEW(wd, sizeof(struct wd_softc),
@@ -394,7 +394,7 @@
 }
 
 static bool
-wd_suspend(device_t dv PMF_FN_ARGS)
+wd_suspend(device_t dv, pmf_qual_t qual)
 {
 	struct wd_softc *sc = device_private(dv);