Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 23 Mar 2012 21:19:07 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r233398 - in stable/9/sys: dev/oce i386/conf
Message-ID:  <201203232119.q2NLJ7mE094753@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jhb
Date: Fri Mar 23 21:19:07 2012
New Revision: 233398
URL: http://svn.freebsd.org/changeset/base/233398

Log:
  MFC 232470:
  Use pci_find_cap() instead of pci_find_extcap() to locate PCI
  find capabilities as the latter API is deprecated for this purpose.

Modified:
  stable/9/sys/dev/oce/oce_hw.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)

Modified: stable/9/sys/dev/oce/oce_hw.c
==============================================================================
--- stable/9/sys/dev/oce/oce_hw.c	Fri Mar 23 21:07:10 2012	(r233397)
+++ stable/9/sys/dev/oce/oce_hw.c	Fri Mar 23 21:19:07 2012	(r233398)
@@ -203,12 +203,12 @@ void oce_get_pci_capabilities(POCE_SOFTC
 {
 	uint32_t val;
 
-	if (pci_find_extcap(sc->dev, PCIY_PCIX, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_PCIX, &val) == 0) {
 		if (val != 0) 
 			sc->flags |= OCE_FLAGS_PCIX;
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_EXPRESS, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_EXPRESS, &val) == 0) {
 		if (val != 0) {
 			uint16_t link_status =
 			    pci_read_config(sc->dev, val + 0x12, 2);
@@ -219,12 +219,12 @@ void oce_get_pci_capabilities(POCE_SOFTC
 		}
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_MSI, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_MSI, &val) == 0) {
 		if (val != 0)
 			sc->flags |= OCE_FLAGS_MSI_CAPABLE;
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_MSIX, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_MSIX, &val) == 0) {
 		if (val != 0) {
 			val = pci_msix_count(sc->dev);
 			sc->flags |= OCE_FLAGS_MSIX_CAPABLE;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203232119.q2NLJ7mE094753>