Update the various xxx_verbose modules to conform to the module subsystem's

new locking protocol.
This commit is contained in:
pgoyette 2010-08-21 13:18:35 +00:00
parent 4a743ad47d
commit f05cff10bd
5 changed files with 15 additions and 30 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi.c,v 1.215 2010/08/09 09:36:42 gsutre Exp $ */
/* $NetBSD: acpi.c,v 1.216 2010/08/21 13:18:35 pgoyette Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.215 2010/08/09 09:36:42 gsutre Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.216 2010/08/21 13:18:35 pgoyette Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@ -1793,11 +1793,8 @@ void
acpi_load_verbose(void)
{
if (acpi_verbose_loaded == 0) {
mutex_enter(&module_lock);
if (acpi_verbose_loaded == 0)
module_autoload("acpiverbose", MODULE_CLASS_MISC);
mutex_exit(&module_lock);
}
}
void

View File

@ -1,4 +1,4 @@
/* $NetBSD: mii_physubr.c,v 1.71 2010/07/25 14:44:34 pgoyette Exp $ */
/* $NetBSD: mii_physubr.c,v 1.72 2010/08/21 13:18:35 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.71 2010/07/25 14:44:34 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.72 2010/08/21 13:18:35 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -71,11 +71,8 @@ const char *mii_get_descr_stub(int oui, int model)
*/
void mii_load_verbose(void)
{
if (mii_verbose_loaded == 0) {
mutex_enter(&module_lock);
if (mii_verbose_loaded == 0)
module_autoload("miiverbose", MODULE_CLASS_MISC);
mutex_exit(&module_lock);
}
}
static void mii_phy_statusmsg(struct mii_softc *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_subr.c,v 1.84 2010/07/25 14:14:25 pgoyette Exp $ */
/* $NetBSD: pci_subr.c,v 1.85 2010/08/21 13:18:35 pgoyette Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.84 2010/07/25 14:14:25 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.85 2010/08/21 13:18:35 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@ -323,11 +323,8 @@ int pciverbose_loaded = 0;
*/
void pci_load_verbose(void)
{
if (pciverbose_loaded == 0) {
mutex_enter(&module_lock);
if (pciverbose_loaded == 0)
module_autoload("pciverbose", MODULE_CLASS_MISC);
mutex_exit(&module_lock);
}
}
const char *pci_findvendor_stub(pcireg_t id_reg)

View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipiconf.c,v 1.39 2010/07/25 13:49:58 pgoyette Exp $ */
/* $NetBSD: scsipiconf.c,v 1.40 2010/08/21 13:18:36 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.39 2010/07/25 13:49:58 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.40 2010/08/21 13:18:36 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -107,11 +107,8 @@ scsipi_command(struct scsipi_periph *periph, struct scsipi_generic *cmd,
void
scsipi_load_verbose(void)
{
if (scsi_verbose_loaded == 0) {
mutex_enter(&module_lock);
if (scsi_verbose_loaded == 0)
module_autoload("scsiverbose", MODULE_CLASS_MISC);
mutex_exit(&module_lock);
}
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_subr.c,v 1.175 2010/08/07 21:09:48 christos Exp $ */
/* $NetBSD: usb_subr.c,v 1.176 2010/08/21 13:18:36 pgoyette Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.175 2010/08/07 21:09:48 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.176 2010/08/21 13:18:36 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
@ -122,11 +122,8 @@ int usb_verbose_loaded = 0;
*/
void usb_load_verbose(void)
{
if (usb_verbose_loaded == 0) {
mutex_enter(&module_lock);
if (usb_verbose_loaded == 0)
module_autoload("usbverbose", MODULE_CLASS_MISC);
mutex_exit(&module_lock);
}
}
void get_usb_vendor_stub(char *v, size_t l, usb_vendor_id_t v_id)