From cf51fdce33cceb21f045884bd8ac674d82bb7fa5 Mon Sep 17 00:00:00 2001
From: Matthew Dempsky <matthew@cvs.openbsd.org>
Date: Sun, 3 Jul 2011 15:47:19 +0000
Subject: Remove config_activate() and DVACT_ACTIVATE.  PCMCIA's the only thing
 that's ever used it, and it's long since been changed to use
 DVACT_{QUIESCE,SUSPEND,RESUME} instead.

ok deraadt@, dlg@; miod@ also agreed with this idea when I brought it
up a few weeks ago
---
 sys/scsi/scsiconf.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'sys/scsi/scsiconf.c')

diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 45748d2b7a0..08b04930ef4 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.c,v 1.176 2011/06/21 22:36:42 matthew Exp $	*/
+/*	$OpenBSD: scsiconf.c,v 1.177 2011/07/03 15:47:18 matthew Exp $	*/
 /*	$NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $	*/
 
 /*
@@ -247,10 +247,6 @@ scsi_activate_lun(struct scsibus_softc *sc, int target, int lun, int act)
 
 	dev = link->device_softc;
 	switch (act) {
-	case DVACT_ACTIVATE:
-		atomic_clearbits_int(&link->state, SDEV_S_DYING);
-		config_activate(dev);
-		break;
 	case DVACT_QUIESCE:
 	case DVACT_SUSPEND:
 	case DVACT_RESUME:
-- 
cgit v1.2.3