From owner-svn-src-head@FreeBSD.ORG  Wed Apr  4 16:15:41 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 5667E1065674;
	Wed,  4 Apr 2012 16:15:41 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 415F48FC0C;
	Wed,  4 Apr 2012 16:15:41 +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 q34GFfEt013915;
	Wed, 4 Apr 2012 16:15:41 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q34GFfHU013912;
	Wed, 4 Apr 2012 16:15:41 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201204041615.q34GFfHU013912@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 4 Apr 2012 16:15:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233877 - head/sys/dev/mfi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 04 Apr 2012 16:15:41 -0000

Author: jkim
Date: Wed Apr  4 16:15:40 2012
New Revision: 233877
URL: http://svn.freebsd.org/changeset/base/233877

Log:
  - Do not include machine/atomic.h.  It is no longer necessary since r233768.
  - Remove bogus "atomic" macros and a read-only variable from softc.
  
  Reviewed by:	ambrisko

Modified:
  head/sys/dev/mfi/mfi_tbolt.c
  head/sys/dev/mfi/mfivar.h

Modified: head/sys/dev/mfi/mfi_tbolt.c
==============================================================================
--- head/sys/dev/mfi/mfi_tbolt.c	Wed Apr  4 14:51:04 2012	(r233876)
+++ head/sys/dev/mfi/mfi_tbolt.c	Wed Apr  4 16:15:40 2012	(r233877)
@@ -520,12 +520,6 @@ int mfi_tbolt_reset(struct mfi_softc *sc
 	uint32_t fw_state;
 
 	mtx_lock(&sc->mfi_io_lock);
-	if (mfi_atomic_read(&sc->fw_reset_no_pci_access)) {
-		device_printf(sc->mfi_dev, "NO PCI ACCESS\n");
-		mtx_unlock(&sc->mfi_io_lock);
-		return 1;
-	}
-
 	if (sc->hw_crit_error) {
 		device_printf(sc->mfi_dev, "HW CRITICAL ERROR\n");
 		mtx_unlock(&sc->mfi_io_lock);

Modified: head/sys/dev/mfi/mfivar.h
==============================================================================
--- head/sys/dev/mfi/mfivar.h	Wed Apr  4 14:51:04 2012	(r233876)
+++ head/sys/dev/mfi/mfivar.h	Wed Apr  4 16:15:40 2012	(r233877)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/taskqueue.h>
-#include <machine/atomic.h>
 
 /*
  * SCSI structures and definitions are used from here, but no linking
@@ -162,12 +161,6 @@ struct megasas_sge
 };
 
 struct mfi_cmd_tbolt;
-struct mfi_atomic {
-	volatile unsigned int		val;
-};
-
-#define	mfi_atomic_read(v)	((v)->val)
-#define	mfi_atomic_set(v,i)	((v)->val - (i))
 
 struct mfi_softc {
 	device_t			mfi_dev;
@@ -246,7 +239,6 @@ struct mfi_softc {
 	struct intr_config_hook		mfi_ich;
 	eventhandler_tag		eh;
 	/* OCR flags */
-	struct mfi_atomic		fw_reset_no_pci_access;
 	uint8_t adpreset;
 	uint8_t issuepend_done;
 	uint8_t disableOnlineCtrlReset;