From owner-svn-src-head@FreeBSD.ORG  Mon Apr  2 02:22:23 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C672106566B;
	Mon,  2 Apr 2012 02:22:23 +0000 (UTC)
	(envelope-from ambrisko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EC2568FC0A;
	Mon,  2 Apr 2012 02:22:22 +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 q322MMxB076399;
	Mon, 2 Apr 2012 02:22:22 GMT (envelope-from ambrisko@svn.freebsd.org)
Received: (from ambrisko@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q322MMJS076397;
	Mon, 2 Apr 2012 02:22:22 GMT (envelope-from ambrisko@svn.freebsd.org)
Message-Id: <201204020222.q322MMJS076397@svn.freebsd.org>
From: Doug Ambrisko <ambrisko@FreeBSD.org>
Date: Mon, 2 Apr 2012 02:22:22 +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: r233768 - 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: Mon, 02 Apr 2012 02:22:23 -0000

Author: ambrisko
Date: Mon Apr  2 02:22:22 2012
New Revision: 233768
URL: http://svn.freebsd.org/changeset/base/233768

Log:
  Change typedef atomic_t to struct mfi_atomic to avoid name space
  collision and some couple more style changes.

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

Modified: head/sys/dev/mfi/mfivar.h
==============================================================================
--- head/sys/dev/mfi/mfivar.h	Mon Apr  2 00:11:26 2012	(r233767)
+++ head/sys/dev/mfi/mfivar.h	Mon Apr  2 02:22:22 2012	(r233768)
@@ -149,16 +149,16 @@ struct mfi_aen {
 };
 
 struct mfi_skinny_dma_info {
-	bus_dma_tag_t	dmat[514];
-	bus_dmamap_t	dmamap[514];
-	uint32_t	mem[514];
-	int		noofmaps;
+	bus_dma_tag_t			dmat[514];
+	bus_dmamap_t			dmamap[514];
+	uint32_t			mem[514];
+	int				noofmaps;
 };
 
 struct mfi_cmd_tbolt;
-typedef struct {
-	volatile unsigned int val;
-} atomic_t;
+struct mfi_atomic {
+	volatile unsigned int		val;
+};
 
 #define	atomic_read(v)	((v)->val)
 #define	atomic_set(v,i)	((v)->val - (i))
@@ -240,7 +240,7 @@ struct mfi_softc {
 	struct intr_config_hook		mfi_ich;
 	eventhandler_tag		eh;
 	/* OCR flags */
-	atomic_t fw_reset_no_pci_access;
+	struct mfi_atomic		fw_reset_no_pci_access;
 	uint8_t adpreset;
 	uint8_t issuepend_done;
 	uint8_t disableOnlineCtrlReset;