[src/trunk]: src/sys/dev/raidframe Set the raidid and the softc together in b...

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

details:   https://anonhg.NetBSD.org/src/rev/6bf10e4d256d
branches:  trunk
changeset: 786492:6bf10e4d256d
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Apr 29 21:21:10 2013 +0000

description:
Set the raidid and the softc together in both places where we initialize
raidPtr.

diffstat:

 sys/dev/raidframe/rf_netbsdkintf.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 01413679afc0 -r 6bf10e4d256d sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Mon Apr 29 20:08:48 2013 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Mon Apr 29 21:21:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsdkintf.c,v 1.301 2013/04/28 03:12:37 christos Exp $    */
+/*     $NetBSD: rf_netbsdkintf.c,v 1.302 2013/04/29 21:21:10 christos Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***********************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.301 2013/04/28 03:12:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.302 2013/04/29 21:21:10 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -329,7 +329,6 @@
                return NULL;
        }
        sc->sc_unit = unit;
-       sc->sc_r.softc = sc;
        bufq_alloc(&sc->buf_queue, BUFQ_DISK_DEFAULT_STRAT, BUFQ_SORT_RAWBLOCK);
        return sc;
 }
@@ -1168,6 +1167,7 @@
                 *  reconfiguration
                 */
                memset(raidPtr, 0, sizeof(*raidPtr));
+               raidPtr->softc = rs;
                raidPtr->raidid = unit;
 
                retcode = rf_Configure(raidPtr, k_cfg, NULL);
@@ -3735,6 +3735,7 @@
        raidPtr = &sc->sc_r;
 
        /* XXX all this stuff should be done SOMEWHERE ELSE! */
+       raidPtr->softc = sc;
        raidPtr->raidid = raidID;
        raidPtr->openings = RAIDOUTSTANDING;