svn commit: r264948 - stable/10/sys/dev/iwn

[Marius Strobl]

Author: marius
Date: Fri Apr 25 21:58:28 2014
New Revision: 264948
URL: http://svnweb.freebsd.org/changeset/base/264948

Log:
  MFC: r260086
  
  - Probe with BUS_PROBE_DEFAULT instead of 0.
  - Remove clearing PCIM_CMD_INTxDIS; pci(4) will do that as appropriate since
    r189367.

Modified:
  stable/10/sys/dev/iwn/if_iwn.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/10/sys/dev/iwn/if_iwn.c	Fri Apr 25 21:58:16 2014	(r264947)
+++ stable/10/sys/dev/iwn/if_iwn.c	Fri Apr 25 21:58:28 2014	(r264948)
@@ -441,7 +441,7 @@ iwn_probe(device_t dev)
 		if (pci_get_vendor(dev) == ident->vendor &&
 		    pci_get_device(dev) == ident->device) {
 			device_set_desc(dev, ident->name);
-			return 0;
+			return (BUS_PROBE_DEFAULT);
 		}
 	}
 	return ENXIO;
@@ -453,7 +453,6 @@ iwn_attach(device_t dev)
 	struct iwn_softc *sc = (struct iwn_softc *)device_get_softc(dev);
 	struct ieee80211com *ic;
 	struct ifnet *ifp;
-	uint32_t reg;
 	int i, error, rid;
 	uint8_t macaddr[IEEE80211_ADDR_LEN];
 
@@ -483,15 +482,6 @@ iwn_attach(device_t dev)
 	/* Clear device-specific "PCI retry timeout" register (41h). */
 	pci_write_config(dev, 0x41, 0, 1);
 
-	/* Hardware bug workaround. */
-	reg = pci_read_config(dev, PCIR_COMMAND, 2);
-	if (reg & PCIM_CMD_INTxDIS) {
-		DPRINTF(sc, IWN_DEBUG_RESET, "%s: PCIe INTx Disable set\n",
-		    __func__);
-		reg &= ~PCIM_CMD_INTxDIS;
-		pci_write_config(dev, PCIR_COMMAND, reg, 2);
-	}
-
 	/* Enable bus-mastering. */
 	pci_enable_busmaster(dev);