[src/trunk]: src/sys/dev Update the various xxx_verbose modules to conform to...

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

details:   https://anonhg.NetBSD.org/src/rev/88f25f15a1b8
branches:  trunk
changeset: 757251:88f25f15a1b8
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Aug 21 13:18:35 2010 +0000

description:
Update the various xxx_verbose modules to conform to the module subsystem's
new locking protocol.

diffstat:

 sys/dev/acpi/acpi.c         |  9 +++------
 sys/dev/mii/mii_physubr.c   |  9 +++------
 sys/dev/pci/pci_subr.c      |  9 +++------
 sys/dev/scsipi/scsipiconf.c |  9 +++------
 sys/dev/usb/usb_subr.c      |  9 +++------
 5 files changed, 15 insertions(+), 30 deletions(-)

diffs (155 lines):

diff -r de32dcd51fa2 -r 88f25f15a1b8 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Sat Aug 21 13:17:31 2010 +0000
+++ b/sys/dev/acpi/acpi.c       Sat Aug 21 13:18:35 2010 +0000
@@ -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 @@
 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
diff -r de32dcd51fa2 -r 88f25f15a1b8 sys/dev/mii/mii_physubr.c
--- a/sys/dev/mii/mii_physubr.c Sat Aug 21 13:17:31 2010 +0000
+++ b/sys/dev/mii/mii_physubr.c Sat Aug 21 13:18:35 2010 +0000
@@ -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 @@
  */
 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 *);
diff -r de32dcd51fa2 -r 88f25f15a1b8 sys/dev/pci/pci_subr.c
--- a/sys/dev/pci/pci_subr.c    Sat Aug 21 13:17:31 2010 +0000
+++ b/sys/dev/pci/pci_subr.c    Sat Aug 21 13:18:35 2010 +0000
@@ -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 @@
  */
 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)
diff -r de32dcd51fa2 -r 88f25f15a1b8 sys/dev/scsipi/scsipiconf.c
--- a/sys/dev/scsipi/scsipiconf.c       Sat Aug 21 13:17:31 2010 +0000
+++ b/sys/dev/scsipi/scsipiconf.c       Sat Aug 21 13:18:35 2010 +0000
@@ -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 @@
 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);
-       }
 }
 
 /*
diff -r de32dcd51fa2 -r 88f25f15a1b8 sys/dev/usb/usb_subr.c
--- a/sys/dev/usb/usb_subr.c    Sat Aug 21 13:17:31 2010 +0000
+++ b/sys/dev/usb/usb_subr.c    Sat Aug 21 13:18:35 2010 +0000
@@ -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 @@
  */
 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)