port-arm/44081: evbarm/SMDK2410 kernel fails to compile

[bds%ifgd.net@localhost]

>Number:         44081
>Category:       port-arm
>Synopsis:       evbarm/SMDK2410 kernel fails to compile
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    port-arm-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 11 06:10:01 +0000 2010
>Originator:     Brett Slager
>Release:        NetBSD-current
>Organization:
>Environment:
NetBSD-current
>Description:
        The evbarm/SMDK2410 kernel fails to compile due to removal of usb
        compatability stuff.
>How-To-Repeat:
        Try building an -current SMDK2410 kernel, or observe the failed NetBSD
        daily snapshot builds.
>Fix:
        Use device_t instead of now nonexistant device_ptr_t.  Use device_t 
        and cfdata_t typedefs elsewhere as well.  Also, insert missing
        aprint_naive().
Patch:

Index: ohci_s3c24x0.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c,v
retrieving revision 1.6
diff -u -r1.6 ohci_s3c24x0.c
--- ohci_s3c24x0.c      28 Apr 2008 20:23:14 -0000      1.6
+++ ohci_s3c24x0.c      11 Nov 2010 05:43:17 -0000
@@ -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);
 }