[src/trunk]: src/sys/arch/alpha/include struct device * -> device_t

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

details:   https://anonhg.NetBSD.org/src/rev/1b219dd49558
branches:  trunk
changeset: 766047:1b219dd49558
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jun 14 06:47:52 2011 +0000

description:
struct device * -> device_t

diffstat:

 sys/arch/alpha/include/cpuconf.h      |   4 ++--
 sys/arch/alpha/include/eisa_machdep.h |   4 ++--
 sys/arch/alpha/include/isa_machdep.h  |   4 ++--
 sys/arch/alpha/include/pci_machdep.h  |  12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (87 lines):

diff -r 35554645864f -r 1b219dd49558 sys/arch/alpha/include/cpuconf.h
--- a/sys/arch/alpha/include/cpuconf.h  Tue Jun 14 05:50:24 2011 +0000
+++ b/sys/arch/alpha/include/cpuconf.h  Tue Jun 14 06:47:52 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpuconf.h,v 1.13 2001/07/27 00:25:19 thorpej Exp $     */
+/*     $NetBSD: cpuconf.h,v 1.14 2011/06/14 06:49:31 matt Exp $        */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -65,7 +65,7 @@
         *      mcheck_handler  -       Platform Specific Machine Check Handler
         */
        void    (*cons_init)(void);
-       void    (*device_register)(struct device *, void *);
+       void    (*device_register)(device_t, void *);
        void    (*clockintr)(struct clockframe *);
        void    (*mcheck_handler)(unsigned long, struct trapframe *,
                    unsigned long, unsigned long);
diff -r 35554645864f -r 1b219dd49558 sys/arch/alpha/include/eisa_machdep.h
--- a/sys/arch/alpha/include/eisa_machdep.h     Tue Jun 14 05:50:24 2011 +0000
+++ b/sys/arch/alpha/include/eisa_machdep.h     Tue Jun 14 06:47:52 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.h,v 1.9 2007/10/17 19:52:58 garbled Exp $ */
+/* $NetBSD: eisa_machdep.h,v 1.10 2011/06/14 06:47:52 matt Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -36,7 +36,7 @@
 struct alpha_eisa_chipset {
        void    *ec_v;
 
-       void    (*ec_attach_hook)(struct device *, struct device *,
+       void    (*ec_attach_hook)(device_t, device_t,
                    struct eisabus_attach_args *);
        int     (*ec_maxslots)(void *);
        int     (*ec_intr_map)(void *, u_int, eisa_intr_handle_t *);
diff -r 35554645864f -r 1b219dd49558 sys/arch/alpha/include/isa_machdep.h
--- a/sys/arch/alpha/include/isa_machdep.h      Tue Jun 14 05:50:24 2011 +0000
+++ b/sys/arch/alpha/include/isa_machdep.h      Tue Jun 14 06:47:52 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.12 2009/08/19 15:09:56 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.13 2011/06/14 06:47:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
        struct isa_dma_state ic_dmastate;
 
-       void    (*ic_attach_hook)(struct device *, struct device *,
+       void    (*ic_attach_hook)(device_t, device_t,
                    struct isabus_attach_args *);
        const struct evcnt *(*ic_intr_evcnt)(void *, int);
        void    *(*ic_intr_establish)(void *, int, int, int,
diff -r 35554645864f -r 1b219dd49558 sys/arch/alpha/include/pci_machdep.h
--- a/sys/arch/alpha/include/pci_machdep.h      Tue Jun 14 05:50:24 2011 +0000
+++ b/sys/arch/alpha/include/pci_machdep.h      Tue Jun 14 06:47:52 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.13 2011/04/04 20:37:44 dyoung Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.14 2011/06/14 06:47:53 matt Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -50,8 +50,8 @@
  */
 struct alpha_pci_chipset {
        void            *pc_conf_v;
-       void            (*pc_attach_hook)(struct device *,
-                           struct device *, struct pcibus_attach_args *);
+       void            (*pc_attach_hook)(device_t, device_t,
+                           struct pcibus_attach_args *);
        int             (*pc_bus_maxdevs)(void *, int);
        pcitag_t        (*pc_make_tag)(void *, int, int, int);
        void            (*pc_decompose_tag)(void *, pcitag_t, int *,
@@ -68,9 +68,9 @@
                            int, int (*)(void *), void *);
        void            (*pc_intr_disestablish)(void *, void *);
 
-       void            *(*pc_pciide_compat_intr_establish)(void *,
-                           struct device *, const struct pci_attach_args *,
-                           int, int (*)(void *), void *);
+       void            *(*pc_pciide_compat_intr_establish)(void *, device_t,
+                           const struct pci_attach_args *, int,
+                           int (*)(void *), void *);
 };
 
 /*