Sun Aug 8 18:25:14 2010 UTC ()
only print the boot-time message if we're being verbose.


(chs)
diff -r1.273 -r1.274 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs diff -r1.273 -r1.274 src/sys/dev/raidframe/rf_netbsdkintf.c (expand / switch to unified diff)

--- src/sys/dev/raidframe/rf_netbsdkintf.c 2010/03/14 21:11:41 1.273
+++ src/sys/dev/raidframe/rf_netbsdkintf.c 2010/08/08 18:25:14 1.274
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rf_netbsdkintf.c,v 1.273 2010/03/14 21:11:41 jld Exp $ */ 1/* $NetBSD: rf_netbsdkintf.c,v 1.274 2010/08/08 18:25:14 chs Exp $ */
2/*- 2/*-
3 * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. 3 * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to The NetBSD Foundation 6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Greg Oster; Jason R. Thorpe. 7 * by Greg Oster; Jason R. Thorpe.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -129,27 +129,27 @@ @@ -129,27 +129,27 @@
129 * Pittsburgh PA 15213-3890 129 * Pittsburgh PA 15213-3890
130 * 130 *
131 * any improvements or extensions that they make and grant Carnegie the 131 * any improvements or extensions that they make and grant Carnegie the
132 * rights to redistribute these changes. 132 * rights to redistribute these changes.
133 */ 133 */
134 134
135/*********************************************************** 135/***********************************************************
136 * 136 *
137 * rf_kintf.c -- the kernel interface routines for RAIDframe 137 * rf_kintf.c -- the kernel interface routines for RAIDframe
138 * 138 *
139 ***********************************************************/ 139 ***********************************************************/
140 140
141#include <sys/cdefs.h> 141#include <sys/cdefs.h>
142__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.273 2010/03/14 21:11:41 jld Exp $"); 142__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.274 2010/08/08 18:25:14 chs Exp $");
143 143
144#ifdef _KERNEL_OPT 144#ifdef _KERNEL_OPT
145#include "opt_compat_netbsd.h" 145#include "opt_compat_netbsd.h"
146#include "opt_raid_autoconfig.h" 146#include "opt_raid_autoconfig.h"
147#include "raid.h" 147#include "raid.h"
148#endif 148#endif
149 149
150#include <sys/param.h> 150#include <sys/param.h>
151#include <sys/errno.h> 151#include <sys/errno.h>
152#include <sys/pool.h> 152#include <sys/pool.h>
153#include <sys/proc.h> 153#include <sys/proc.h>
154#include <sys/queue.h> 154#include <sys/queue.h>
155#include <sys/disk.h> 155#include <sys/disk.h>
@@ -375,27 +375,27 @@ raidattach(int num) @@ -375,27 +375,27 @@ raidattach(int num)
375 panic("raidPtrs is NULL!!"); 375 panic("raidPtrs is NULL!!");
376 } 376 }
377 377
378#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0) 378#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0)
379 rf_mutex_init(&rf_sparet_wait_mutex); 379 rf_mutex_init(&rf_sparet_wait_mutex);
380 380
381 rf_sparet_wait_queue = rf_sparet_resp_queue = NULL; 381 rf_sparet_wait_queue = rf_sparet_resp_queue = NULL;
382#endif 382#endif
383 383
384 for (i = 0; i < num; i++) 384 for (i = 0; i < num; i++)
385 raidPtrs[i] = NULL; 385 raidPtrs[i] = NULL;
386 rc = rf_BootRaidframe(); 386 rc = rf_BootRaidframe();
387 if (rc == 0) 387 if (rc == 0)
388 aprint_normal("Kernelized RAIDframe activated\n"); 388 aprint_verbose("Kernelized RAIDframe activated\n");
389 else 389 else
390 panic("Serious error booting RAID!!"); 390 panic("Serious error booting RAID!!");
391 391
392 /* put together some datastructures like the CCD device does.. This 392 /* put together some datastructures like the CCD device does.. This
393 * lets us lock the device and what-not when it gets opened. */ 393 * lets us lock the device and what-not when it gets opened. */
394 394
395 raid_softc = (struct raid_softc *) 395 raid_softc = (struct raid_softc *)
396 malloc(num * sizeof(struct raid_softc), 396 malloc(num * sizeof(struct raid_softc),
397 M_RAIDFRAME, M_NOWAIT); 397 M_RAIDFRAME, M_NOWAIT);
398 if (raid_softc == NULL) { 398 if (raid_softc == NULL) {
399 aprint_error("WARNING: no memory for RAIDframe driver\n"); 399 aprint_error("WARNING: no memory for RAIDframe driver\n");
400 return; 400 return;
401 } 401 }