svn commit: r200718 - stable/8/sys/dev/ichsmb

[Andriy Gapon]

Author: avg
Date: Sat Dec 19 11:05:42 2009
New Revision: 200718
URL: http://svn.freebsd.org/changeset/base/200718

Log:
  MFC r200053,200091: ichsmb: drop default attachment to generic smbus hw
  
  Note that r200091 completely overrides r200053 and the merge of the
  former is recorded for bookkeeping only.
  r200091 won't be merged to 'more stable' branche(s) because of the POLA.

Modified:
  stable/8/sys/dev/ichsmb/ichsmb_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- stable/8/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 10:55:41 2009	(r200717)
+++ stable/8/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 11:05:42 2009	(r200718)
@@ -175,12 +175,6 @@ ichsmb_pci_probe(device_t dev)
 		device_set_desc(dev, "Intel 631xESB/6321ESB (ESB2) SMBus controller");
 		break;
 	default:
-		if (pci_get_class(dev) == PCIC_SERIALBUS
-		    && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS
-		    && pci_get_progif(dev) == PCIS_SERIALBUS_SMBUS_PROGIF) {
-			device_set_desc(dev, "SMBus controller");
-			return (BUS_PROBE_DEFAULT); /* XXX */
-		}
 		return (ENXIO);
 	}