[src/trunk]: src/sys/arch/amiga/clockport Obtain sc using device_private(), c...

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

details:   https://anonhg.NetBSD.org/src/rev/4eea051bdb3d
branches:  trunk
changeset: 779935:4eea051bdb3d
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Thu Jun 28 18:55:03 2012 +0000

description:
Obtain sc using device_private(), cosmetic changes.

diffstat:

 sys/arch/amiga/clockport/a1k2cp.c       |  4 ++--
 sys/arch/amiga/clockport/clockport.c    |  4 ++--
 sys/arch/amiga/clockport/clockportvar.h |  3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r b2b875d0fc3d -r 4eea051bdb3d sys/arch/amiga/clockport/a1k2cp.c
--- a/sys/arch/amiga/clockport/a1k2cp.c Thu Jun 28 17:53:42 2012 +0000
+++ b/sys/arch/amiga/clockport/a1k2cp.c Thu Jun 28 18:55:03 2012 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: a1k2cp.c,v 1.1 2012/04/17 09:59:03 rkujawa Exp $ */
+/*      $NetBSD: a1k2cp.c,v 1.2 2012/06/28 18:55:03 rkujawa Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
        a1k2cp_aa.cp_intr_establish = clockport_generic_intr_establish;
 
 #ifdef A1K2CP_DEBUG
-       aprint_normal_dev(sc->sc_dev, "pa %d va %p", 
+       aprint_normal_dev(sc->sc_dev, "pa %x va %p\n", 
            A1K2CP_BASE, (void*) a1k2cp_bst.base);
 #endif /* A1K2CP_DEBUG */
 
diff -r b2b875d0fc3d -r 4eea051bdb3d sys/arch/amiga/clockport/clockport.c
--- a/sys/arch/amiga/clockport/clockport.c      Thu Jun 28 17:53:42 2012 +0000
+++ b/sys/arch/amiga/clockport/clockport.c      Thu Jun 28 18:55:03 2012 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockport.c,v 1.2 2012/05/18 20:52:02 rkujawa Exp $ */
+/*      $NetBSD: clockport.c,v 1.3 2012/06/28 18:55:03 rkujawa Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 
         aprint_normal("\n");
 
-       sc = (struct clockportbus_softc *) self;
+       sc = device_private(self);
        sc->cpb_aa = (struct clockportbus_attach_args *) aux;
 
        config_search_ia(clockport_submatch, self, "clockport", 0);
diff -r b2b875d0fc3d -r 4eea051bdb3d sys/arch/amiga/clockport/clockportvar.h
--- a/sys/arch/amiga/clockport/clockportvar.h   Thu Jun 28 17:53:42 2012 +0000
+++ b/sys/arch/amiga/clockport/clockportvar.h   Thu Jun 28 18:55:03 2012 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockportvar.h,v 1.2 2012/05/15 17:35:43 rkujawa Exp $ */
+/*      $NetBSD: clockportvar.h,v 1.3 2012/06/28 18:55:03 rkujawa Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
 };
 
 struct clockportbus_softc {
+       device_t        sc_dev;
 
        struct clockportbus_attach_args *cpb_aa;
 };