From owner-svn-src-head@FreeBSD.ORG  Mon Oct 22 04:18:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A7E81172;
 Mon, 22 Oct 2012 04:18:17 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 907298FC08;
 Mon, 22 Oct 2012 04:18:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9M4IHCD030370;
 Mon, 22 Oct 2012 04:18:17 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9M4IHRK030368;
 Mon, 22 Oct 2012 04:18:17 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210220418.q9M4IHRK030368@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 22 Oct 2012 04:18:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241863 - head/sys/dev/mpt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 04:18:17 -0000

Author: eadler
Date: Mon Oct 22 04:18:17 2012
New Revision: 241863
URL: http://svn.freebsd.org/changeset/base/241863

Log:
  Now that device disabling is generic, remove the non-standard
  implementation from mpt
  
  Don't MFC this to retain backwards compatibility.
  
  Reviewed by:	des, mjacob
  Approved by:	cperciva

Modified:
  head/sys/dev/mpt/mpt_pci.c

Modified: head/sys/dev/mpt/mpt_pci.c
==============================================================================
--- head/sys/dev/mpt/mpt_pci.c	Mon Oct 22 03:57:00 2012	(r241862)
+++ head/sys/dev/mpt/mpt_pci.c	Mon Oct 22 04:18:17 2012	(r241863)
@@ -268,11 +268,6 @@ mpt_set_options(struct mpt_softc *mpt)
 
 	tval = 0;
 	if (resource_int_value(device_get_name(mpt->dev),
-	    device_get_unit(mpt->dev), "disable", &tval) == 0 && tval != 0) {
-		mpt->disabled = 1;
-	}
-	tval = 0;
-	if (resource_int_value(device_get_name(mpt->dev),
 	    device_get_unit(mpt->dev), "debug", &tval) == 0 && tval != 0) {
 		mpt->verbose = tval;
 	}