summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2014-03-20 06:48:54 +0000
committerskrll <skrll@NetBSD.org>2014-03-20 06:48:54 +0000
commit97615f8920ae6fc5bd2d5015048b98b5a8c33db9 (patch)
treea809852f1098850237e17e2f8a4cf53c4eca3115 /sys/dev/mca
parent56fd2ca7bbb94ed0af8f420ed5940838c1caeeaa (diff)
Mechanically replace simplelock with kmutex_t.
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/ed_mca.c10
-rw-r--r--sys/dev/mca/edc_mca.c10
-rw-r--r--sys/dev/mca/edvar.h6
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 84b56c19296..1059bf4d15b 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.54 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: ed_mca.c,v 1.55 2014/03/20 06:48:54 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.54 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.55 2014/03/20 06:48:54 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,7 +158,7 @@ ed_mca_attach(device_t parent, device_t self, void *aux)
edc_add_disk(sc, ed);
bufq_alloc(&ed->sc_q, "disksort", BUFQ_SORT_RAWBLOCK);
- simple_lock_init(&ed->sc_q_lock);
+ mutex_init(&ed->sc_q_lock, MUTEX_DEFAULT, IPL_VM);
if (ed_get_params(ed, &drv_flags)) {
printf(": IDENTIFY failed, no disk found\n");
@@ -257,9 +257,9 @@ edmcastrategy(struct buf *bp)
bp->b_rawblkno = blkno;
/* Queue transfer on drive, activate drive and controller if idle. */
- simple_lock(&ed->sc_q_lock);
+ mutex_enter(&ed->sc_q_lock);
bufq_put(ed->sc_q, bp);
- simple_unlock(&ed->sc_q_lock);
+ mutex_exit(&ed->sc_q_lock);
/* Ring the worker thread */
wakeup(ed->edc_softc);
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index 4f121197d49..ed4b416cf11 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.48 2013/10/12 21:11:42 christos Exp $ */
+/* $NetBSD: edc_mca.c,v 1.49 2014/03/20 06:48:54 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.48 2013/10/12 21:11:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.49 2014/03/20 06:48:54 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -815,13 +815,13 @@ edcworker(void *arg)
}
/* Is there a buf for us ? */
- simple_lock(&ed->sc_q_lock);
+ mutex_enter(&ed->sc_q_lock);
if ((bp = bufq_get(ed->sc_q)) == NULL) {
- simple_unlock(&ed->sc_q_lock);
+ mutex_exit(&ed->sc_q_lock);
i++;
continue;
}
- simple_unlock(&ed->sc_q_lock);
+ mutex_exit(&ed->sc_q_lock);
/* Instrumentation. */
disk_busy(&ed->sc_dk);
diff --git a/sys/dev/mca/edvar.h b/sys/dev/mca/edvar.h
index 2faca91c619..5f8c18dc864 100644
--- a/sys/dev/mca/edvar.h
+++ b/sys/dev/mca/edvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: edvar.h,v 1.16 2012/10/27 17:18:26 chs Exp $ */
+/* $NetBSD: edvar.h,v 1.17 2014/03/20 06:48:54 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/simplelock.h>
+#include <sys/mutex.h>
struct edc_mca_softc;
@@ -39,7 +39,7 @@ struct ed_softc {
/* General disk infos */
struct disk sc_dk;
struct bufq_state *sc_q;
- struct simplelock sc_q_lock;
+ kmutex_t sc_q_lock;
struct edc_mca_softc *edc_softc; /* pointer to our controller */