[src/trunk]: src/sys/arch/arm/s3c2xx0 Fix usb_port.h-removal fallout with the...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/572491bd8887
branches:  trunk
changeset: 758624:572491bd8887
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Thu Nov 11 15:58:41 2010 +0000

description:
Fix usb_port.h-removal fallout with the patch by Brett Slager in
port-arm/44081, "evbarm/SMDK2410 kernel fails to compile".

Use device_t instead of device_ptr_t.  Use device_t and cfdata_t
typedefs.  Insert missing aprint_naive().

diffstat:

 sys/arch/arm/s3c2xx0/ohci_s3c24x0.c |  17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r 34aefb45318d -r 572491bd8887 sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
--- a/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c       Thu Nov 11 15:51:05 2010 +0000
+++ b/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c       Thu Nov 11 15:58:41 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci_s3c24x0.c,v 1.6 2008/04/28 20:23:14 martin Exp $ */
+/*     $NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $ */
 
 /* derived from ohci_pci.c */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.6 2008/04/28 20:23:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,9 +54,9 @@
 #include <dev/usb/ohcireg.h>
 #include <dev/usb/ohcivar.h>
 
-int    ohci_ssio_match(struct device *, struct cfdata *, void *);
-void   ohci_ssio_attach(struct device *, struct device *, void *);
-int    ohci_ssio_detach(device_ptr_t, int);
+int    ohci_ssio_match(device_t, cfdata_t, void *);
+void   ohci_ssio_attach(device_t, device_t, void *);
+int    ohci_ssio_detach(device_t, int);
 
 extern int ohcidebug;
 
@@ -70,7 +70,7 @@
     ohci_ssio_match, ohci_ssio_attach, ohci_ssio_detach, ohci_activate);
 
 int
-ohci_ssio_match(struct device *parent, struct cfdata *match, void *aux)
+ohci_ssio_match(device_t parent, cfdata_t match, void *aux)
 {
        struct s3c2xx0_attach_args *sa = (struct s3c2xx0_attach_args *)aux;
        /* XXX: check some registers */
@@ -84,7 +84,7 @@
 }
 
 void
-ohci_ssio_attach(struct device *parent, struct device *self, void *aux)
+ohci_ssio_attach(device_t parent, device_t self, void *aux)
 {
        struct ohci_ssio_softc *sc = device_private(self);
        struct s3c2xx0_attach_args *sa = (struct s3c2xx0_attach_args *)aux;
@@ -92,6 +92,7 @@
        usbd_status r;
 
        aprint_normal("\n");
+       aprint_naive("\n");
 
        sc->sc.sc_dev = self;
        sc->sc.sc_bus.hci_private = sc;
@@ -134,7 +135,7 @@
 }
 
 int
-ohci_ssio_detach(device_ptr_t self, int flags)
+ohci_ssio_detach(device_t self, int flags)
 {
        return (0);
 }