device_ptr_t -> struct device *

i hate typedefs

3 files changed, 9 insertions, 9 deletions

diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c
index 3a89bd510a7..b56b736c86b 100644
--- a/sys/dev/pci/ehci_pci.c
+++ b/sys/dev/pci/ehci_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci_pci.c,v 1.7 2005/08/09 04:10:11 mickey Exp $ */
+/*	$OpenBSD: ehci_pci.c,v 1.8 2005/12/30 03:43:04 dlg Exp $ */
 /*	$NetBSD: ehci_pci.c,v 1.15 2004/04/23 21:13:06 itojun Exp $	*/
 
 /*
@@ -78,7 +78,7 @@ struct ehci_pci_softc {
 
 int	ehci_pci_match(struct device *, void *, void *);
 void	ehci_pci_attach(struct device *, struct device *, void *);
-int	ehci_pci_detach(device_ptr_t, int);
+int	ehci_pci_detach(struct device *, int);
 void	ehci_pci_givecontroller(struct ehci_pci_softc *);
 void	ehci_pci_takecontroller(struct ehci_pci_softc *);
 void	ehci_pci_shutdown(void *);
@@ -202,7 +202,7 @@ ehci_pci_attach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-ehci_pci_detach(device_ptr_t self, int flags)
+ehci_pci_detach(struct device *self, int flags)
 {
 	struct ehci_pci_softc *sc = (struct ehci_pci_softc *)self;
 	int rv;
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index f82cf6846e1..3aef39f4ec0 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_pci.c,v 1.26 2005/08/09 04:10:13 mickey Exp $	*/
+/*	$OpenBSD: ohci_pci.c,v 1.27 2005/12/30 03:43:04 dlg Exp $	*/
 /*	$NetBSD: ohci_pci.c,v 1.23 2002/10/02 16:51:47 thorpej Exp $	*/
 
 /*
@@ -66,7 +66,7 @@
 
 int	ohci_pci_match(struct device *, void *, void *);
 void	ohci_pci_attach(struct device *, struct device *, void *);
-int	ohci_pci_detach(device_ptr_t, int);
+int	ohci_pci_detach(struct device *, int);
 
 struct ohci_pci_softc {
 	ohci_softc_t		sc;
@@ -184,7 +184,7 @@ ohci_pci_attach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-ohci_pci_detach(device_ptr_t self, int flags)
+ohci_pci_detach(struct device *self, int flags)
 {
 	struct ohci_pci_softc *sc = (struct ohci_pci_softc *)self;
 	int rv;
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index 18c06a21f66..fb7f706cda8 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci_pci.c,v 1.20 2005/08/09 04:10:13 mickey Exp $	*/
+/*	$OpenBSD: uhci_pci.c,v 1.21 2005/12/30 03:43:04 dlg Exp $	*/
 /*	$NetBSD: uhci_pci.c,v 1.24 2002/10/02 16:51:58 thorpej Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 
 int	uhci_pci_match(struct device *, void *, void *);
 void	uhci_pci_attach(struct device *, struct device *, void *);
-int	uhci_pci_detach(device_ptr_t, int);
+int	uhci_pci_detach(struct device *, int);
 
 struct uhci_pci_softc {
 	uhci_softc_t		sc;
@@ -185,7 +185,7 @@ uhci_pci_attach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-uhci_pci_detach(device_ptr_t self, int flags)
+uhci_pci_detach(struct device *self, int flags)
 {
 	struct uhci_pci_softc *sc = (struct uhci_pci_softc *)self;
 	int rv;