From owner-svn-src-all@FreeBSD.ORG  Thu Jan 20 08:08:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C913106566C;
	Thu, 20 Jan 2011 08:08:19 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B03B8FC17;
	Thu, 20 Jan 2011 08:08:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0K88J2i005565;
	Thu, 20 Jan 2011 08:08:19 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0K88JUd005562;
	Thu, 20 Jan 2011 08:08:19 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201101200808.p0K88JUd005562@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Thu, 20 Jan 2011 08:08:19 +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: r217625 - head/sys/mips/rmi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jan 2011 08:08:19 -0000

Author: jchandra
Date: Thu Jan 20 08:08:19 2011
New Revision: 217625
URL: http://svn.freebsd.org/changeset/base/217625

Log:
  Fixes in the XLR platform code
  
  - Fix bug in pic.h, assign reg variable, before return.
  - In xlr_pci.c, need to ignore the result of mmio read.

Modified:
  head/sys/mips/rmi/pic.h
  head/sys/mips/rmi/xlr_pci.c

Modified: head/sys/mips/rmi/pic.h
==============================================================================
--- head/sys/mips/rmi/pic.h	Thu Jan 20 07:56:09 2011	(r217624)
+++ head/sys/mips/rmi/pic.h	Thu Jan 20 08:08:19 2011	(r217625)
@@ -163,7 +163,7 @@ pic_read_control(void)
 	uint32_t reg;
 
 	mtx_lock_spin(&xlr_pic_lock);
-	xlr_read_reg(mmio, PIC_CTRL);
+	reg = xlr_read_reg(mmio, PIC_CTRL);
 	mtx_unlock_spin(&xlr_pic_lock);
 	return (reg);
 }
@@ -179,7 +179,7 @@ pic_write_control(uint32_t control)
 }
 
 static __inline void 
-pic_update_control(__uint32_t control)
+pic_update_control(uint32_t control)
 {
 	xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_PIC_OFFSET);
 

Modified: head/sys/mips/rmi/xlr_pci.c
==============================================================================
--- head/sys/mips/rmi/xlr_pci.c	Thu Jan 20 07:56:09 2011	(r217624)
+++ head/sys/mips/rmi/xlr_pci.c	Thu Jan 20 08:08:19 2011	(r217625)
@@ -426,7 +426,7 @@ static void
 bridge_pcix_ack(int irq)
 {
 
-	xlr_read_reg(xlr_io_mmio(XLR_IO_PCIX_OFFSET), 0x140 >> 2);
+	(void)xlr_read_reg(xlr_io_mmio(XLR_IO_PCIX_OFFSET), 0x140 >> 2);
 }
 
 static void