summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2008-02-29 06:38:28 +0000
committerdyoung <dyoung@NetBSD.org>2008-02-29 06:38:28 +0000
commitf612df5fb65d6899befacc5ee366e975e2920365 (patch)
tree745e4fde1cd20e8df9c3d599464fdc7cc7f6760e /sys/dev
parent766105a9076dec60c841368c0cafcba6f91f0743 (diff)
Use PMF_FN_ARGS, PMF_FN_PROTO.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata.c12
-rw-r--r--sys/dev/ata/wd.c8
-rw-r--r--sys/dev/gpio/gpio.c8
-rw-r--r--sys/dev/mii/mii_physubr.c6
-rw-r--r--sys/dev/mii/miivar.h4
-rw-r--r--sys/dev/pckbport/pckbd.c8
-rw-r--r--sys/dev/pckbport/pms.c12
-rw-r--r--sys/dev/scsipi/sd.c8
8 files changed, 33 insertions, 33 deletions
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 5c7dc4d681d..c6296382bcc 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.96 2008/01/10 07:48:22 dyoung Exp $ */
+/* $NetBSD: ata.c,v 1.97 2008/02/29 06:38:28 dyoung Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.96 2008/01/10 07:48:22 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.97 2008/02/29 06:38:28 dyoung Exp $");
#include "opt_ata.h"
@@ -108,8 +108,8 @@ const struct cdevsw atabus_cdevsw = {
extern struct cfdriver atabus_cd;
static void atabus_childdetached(device_t, device_t);
-static bool atabus_resume(device_t);
-static bool atabus_suspend(device_t);
+static bool atabus_resume(device_t PMF_FN_PROTO);
+static bool atabus_suspend(device_t PMF_FN_PROTO);
/*
* atabusprint:
@@ -1518,7 +1518,7 @@ atabusioctl(dev_t dev, u_long cmd, void *addr, int flag,
};
static bool
-atabus_suspend(device_t dv)
+atabus_suspend(device_t dv PMF_FN_ARGS)
{
struct atabus_softc *sc = device_private(dv);
struct ata_channel *chp = sc->sc_chan;
@@ -1529,7 +1529,7 @@ atabus_suspend(device_t dv)
}
static bool
-atabus_resume(device_t dv)
+atabus_resume(device_t dv PMF_FN_ARGS)
{
struct atabus_softc *sc = device_private(dv);
struct ata_channel *chp = sc->sc_chan;
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index ce23543dec3..d68445b8a19 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.357 2008/02/28 14:40:17 drochner Exp $ */
+/* $NetBSD: wd.c,v 1.358 2008/02/29 06:38:28 dyoung Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.357 2008/02/28 14:40:17 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.358 2008/02/29 06:38:28 dyoung Exp $");
#include "opt_ata.h"
@@ -140,7 +140,7 @@ int wdactivate(struct device *, enum devact);
int wdprint(void *, char *);
void wdperror(const struct wd_softc *);
-static bool wd_suspend(device_t);
+static bool wd_suspend(device_t PMF_FN_PROTO);
static int wd_standby(struct wd_softc *, int);
CFATTACH_DECL(wd, sizeof(struct wd_softc),
@@ -430,7 +430,7 @@ wdattach(struct device *parent, struct device *self, void *aux)
}
static bool
-wd_suspend(device_t dv)
+wd_suspend(device_t dv PMF_FN_ARGS)
{
struct wd_softc *sc = device_private(dv);
diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c
index 8f6fff1d34b..6ff72892e2f 100644
--- a/sys/dev/gpio/gpio.c
+++ b/sys/dev/gpio/gpio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.14 2008/01/10 07:49:04 dyoung Exp $ */
+/* $NetBSD: gpio.c,v 1.15 2008/02/29 06:38:59 dyoung Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.14 2008/01/10 07:49:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.15 2008/02/29 06:38:59 dyoung Exp $");
/*
* General Purpose Input/Output framework.
@@ -49,7 +49,7 @@ struct gpio_softc {
int gpio_match(device_t, struct cfdata *, void *);
void gpio_attach(device_t, device_t, void *);
-bool gpio_resume(device_t);
+bool gpio_resume(device_t PMF_FN_PROTO);
int gpio_detach(device_t, int);
int gpio_activate(device_t, enum devact);
int gpio_search(device_t, struct cfdata *, const int *, void *);
@@ -77,7 +77,7 @@ gpio_match(device_t parent, struct cfdata *cf, void *aux)
}
bool
-gpio_resume(device_t self)
+gpio_resume(device_t self PMF_FN_ARGS)
{
struct gpio_softc *sc = device_private(self);
int pin;
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index cfaf68805e2..2ba95f4bc7c 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.57 2008/01/20 07:58:19 msaitoh Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.58 2008/02/29 06:40:38 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.57 2008/01/20 07:58:19 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.58 2008/02/29 06:40:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -626,7 +626,7 @@ mii_phy_flowstatus(struct mii_softc *sc)
}
bool
-mii_phy_resume(device_t dv)
+mii_phy_resume(device_t dv PMF_FN_ARGS)
{
struct mii_softc *sc = device_private(dv);
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 487fb7b4944..43cfcf1a782 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: miivar.h,v 1.49 2008/01/10 07:29:42 dyoung Exp $ */
+/* $NetBSD: miivar.h,v 1.50 2008/02/29 06:40:38 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -233,7 +233,7 @@ void mii_attach(struct device *, struct mii_data *, int, int,
int, int);
void mii_activate(struct mii_data *, enum devact, int, int);
void mii_detach(struct mii_data *, int, int);
-bool mii_phy_resume(device_t);
+bool mii_phy_resume(device_t PMF_FN_PROTO);
int mii_mediachg(struct mii_data *);
void mii_tick(struct mii_data *);
diff --git a/sys/dev/pckbport/pckbd.c b/sys/dev/pckbport/pckbd.c
index a194927101a..f4484f4d92b 100644
--- a/sys/dev/pckbport/pckbd.c
+++ b/sys/dev/pckbport/pckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.20 2008/02/21 01:42:20 joerg Exp $ */
+/* $NetBSD: pckbd.c,v 1.21 2008/02/29 06:42:35 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.20 2008/02/21 01:42:20 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.21 2008/02/29 06:42:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -247,7 +247,7 @@ pckbd_is_console(pckbport_tag_t tag, pckbport_slot_t slot)
}
static bool
-pckbd_suspend(device_t dv)
+pckbd_suspend(device_t dv PMF_FN_ARGS)
{
struct pckbd_softc *sc = device_private(dv);
u_char cmd[1];
@@ -270,7 +270,7 @@ pckbd_suspend(device_t dv)
}
static bool
-pckbd_resume(device_t dv)
+pckbd_resume(device_t dv PMF_FN_ARGS)
{
struct pckbd_softc *sc = device_private(dv);
u_char cmd[1], resp[1];
diff --git a/sys/dev/pckbport/pms.c b/sys/dev/pckbport/pms.c
index 3c03727c7eb..d19457e983e 100644
--- a/sys/dev/pckbport/pms.c
+++ b/sys/dev/pckbport/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.23 2008/01/28 22:29:00 jmcneill Exp $ */
+/* $NetBSD: pms.c,v 1.24 2008/02/29 06:42:35 dyoung Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.23 2008/01/28 22:29:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.24 2008/02/29 06:42:35 dyoung Exp $");
#include "opt_pms.h"
@@ -86,8 +86,8 @@ int pms_enable(void *);
int pms_ioctl(void *, u_long, void *, int, struct lwp *);
void pms_disable(void *);
-static bool pms_suspend(device_t);
-static bool pms_resume(device_t);
+static bool pms_suspend(device_t PMF_FN_PROTO);
+static bool pms_resume(device_t PMF_FN_PROTO);
const struct wsmouse_accessops pms_accessops = {
pms_enable,
@@ -336,7 +336,7 @@ pms_disable(void *v)
}
static bool
-pms_suspend(device_t dv)
+pms_suspend(device_t dv PMF_FN_ARGS)
{
struct pms_softc *sc = device_private(dv);
@@ -347,7 +347,7 @@ pms_suspend(device_t dv)
}
static bool
-pms_resume(device_t dv)
+pms_resume(device_t dv PMF_FN_ARGS)
{
struct pms_softc *sc = device_private(dv);
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index c90e5ee556c..9d03248c0a6 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.270 2008/02/21 21:52:06 drochner Exp $ */
+/* $NetBSD: sd.c,v 1.271 2008/02/29 06:42:35 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.270 2008/02/21 21:52:06 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.271 2008/02/29 06:42:35 dyoung Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -107,7 +107,7 @@ static int sdgetdisklabel(struct sd_softc *);
static void sdstart(struct scsipi_periph *);
static void sdrestart(void *);
static void sddone(struct scsipi_xfer *, int);
-static bool sd_suspend(device_t);
+static bool sd_suspend(device_t PMF_FN_PROTO);
static void sd_shutdown(void *);
static int sd_interpret_sense(struct scsipi_xfer *);
@@ -1349,7 +1349,7 @@ sd_shutdown(void *arg)
}
static bool
-sd_suspend(device_t dv)
+sd_suspend(device_t dv PMF_FN_ARGS)
{
struct sd_softc *sd = device_private(dv);