From 6fbdb01e9a83261fd7ed6a324b968df6a46bfed8 Mon Sep 17 00:00:00 2001
From: attilio <attilio@FreeBSD.org>
Date: Tue, 22 Nov 2011 11:35:24 +0000
Subject: - Use ppb_assert_locked() rather than using explicit mtx_assert call
 - Make ppbus code agnostic in regard of INVARIANTS option

MFC after:	2 weeks
---
 sys/dev/ppbus/vpo.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sys/dev/ppbus/vpo.c')

diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 02bc9b3..9c9054f 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -298,11 +298,8 @@ static void
 vpo_action(struct cam_sim *sim, union ccb *ccb)
 {
 	struct vpo_data *vpo = (struct vpo_data *)sim->softc;
-#ifdef INVARIANTS
-	device_t ppbus = device_get_parent(vpo->vpo_dev);
 
-	ppb_assert_locked(ppbus);
-#endif
+	ppb_assert_locked(device_get_parent(vpo->vpo_dev));
 	switch (ccb->ccb_h.func_code) {
 	case XPT_SCSI_IO:
 	{
-- 
cgit v1.1