From owner-svn-src-head@FreeBSD.ORG  Thu Jul 25 09:30:00 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id ACFA0233;
 Thu, 25 Jul 2013 09:30:00 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9B0AF2AEB;
 Thu, 25 Jul 2013 09:30:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6P9U0BK058452;
 Thu, 25 Jul 2013 09:30:00 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6P9U00t058451;
 Thu, 25 Jul 2013 09:30:00 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201307250930.r6P9U00t058451@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Thu, 25 Jul 2013 09:30:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253646 - head/sys/dev/aic7xxx
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: Thu, 25 Jul 2013 09:30:00 -0000

Author: uqs
Date: Thu Jul 25 09:30:00 2013
New Revision: 253646
URL: http://svnweb.freebsd.org/changeset/base/253646

Log:
  Match function definition to declaration and call-site.
  
  SVN r95378 refactored ahc_9005_subdevinfo_valid out into a separate
  function but swapped the vendor/subvendor and device/subdevice pairs of
  the parameters.
  
  Found by:	Coverity Prevent, CID 744931
  Reviewed by:	gibbs

Modified:
  head/sys/dev/aic7xxx/aic7xxx_pci.c

Modified: head/sys/dev/aic7xxx/aic7xxx_pci.c
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx_pci.c	Thu Jul 25 09:29:48 2013	(r253645)
+++ head/sys/dev/aic7xxx/aic7xxx_pci.c	Thu Jul 25 09:30:00 2013	(r253646)
@@ -673,8 +673,8 @@ const u_int ahc_num_pci_devs = NUM_ELEME
 #define STA	0x08
 #define DPR	0x01
 
-static int ahc_9005_subdevinfo_valid(uint16_t vendor, uint16_t device,
-				     uint16_t subvendor, uint16_t subdevice);
+static int ahc_9005_subdevinfo_valid(uint16_t device, uint16_t vendor,
+				     uint16_t subdevice, uint16_t subvendor);
 static int ahc_ext_scbram_present(struct ahc_softc *ahc);
 static void ahc_scbram_config(struct ahc_softc *ahc, int enable,
 				  int pcheck, int fast, int large);
@@ -766,7 +766,7 @@ ahc_find_pci_device(aic_dev_softc_t pci)
 	 * ID as valid.
 	 */
 	if (aic_get_pci_function(pci) > 0
-	 && ahc_9005_subdevinfo_valid(vendor, device, subvendor, subdevice)
+	 && ahc_9005_subdevinfo_valid(device, vendor, subdevice, subvendor)
 	 && SUBID_9005_MFUNCENB(subdevice) == 0)
 		return (NULL);