svn commit: r273581 - in releng/10.1/sys/dev/hyperv: netvsc stordisengage storvsc utilities

[Xin LI]

Author: delphij
Date: Fri Oct 24 07:50:34 2014
New Revision: 273581
URL: https://svnweb.freebsd.org/changeset/base/273581

Log:
  MFS r273580: MFC r273577:
  
  Return BUS_PROBE_DEFAULT instead of BUS_PROBE_VENDOR or 0 for in-tree
  driver.  This change was verified by Microsoft.
  
  Approved by:	re (kib)

Modified:
  releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
  releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  releng/10.1/sys/dev/hyperv/utilities/hv_util.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Fri Oct 24 07:06:01 2014	(r273580)
+++ releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Fri Oct 24 07:50:34 2014	(r273581)
@@ -218,7 +218,7 @@ netvsc_probe(device_t dev)
 		if (bootverbose)
 			printf("Netvsc probe... DONE \n");
 
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	return (ENXIO);

Modified: releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
==============================================================================
--- releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c	Fri Oct 24 07:06:01 2014	(r273580)
+++ releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c	Fri Oct 24 07:50:34 2014	(r273581)
@@ -116,7 +116,7 @@ hv_ata_pci_probe(device_t dev)
 
 	device_set_desc(dev, "Hyper-V ATA storage disengage driver");
 
-	return (BUS_PROBE_VENDOR);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int

Modified: releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==============================================================================
--- releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c	Fri Oct 24 07:06:01 2014	(r273580)
+++ releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c	Fri Oct 24 07:50:34 2014	(r273581)
@@ -689,14 +689,14 @@ storvsc_probe(device_t dev)
 			if(bootverbose)
 				device_printf(dev,
 					"Enlightened ATA/IDE detected\n");
-			ret = 0;
+			ret = BUS_PROBE_DEFAULT;
 		} else if(bootverbose)
 			device_printf(dev, "Emulated ATA/IDE set (hw.ata.disk_enable set)\n");
 		break;
 	case DRIVER_STORVSC:
 		if(bootverbose)
 			device_printf(dev, "Enlightened SCSI device detected\n");
-		ret = 0;
+		ret = BUS_PROBE_DEFAULT;
 		break;
 	default:
 		ret = ENXIO;

Modified: releng/10.1/sys/dev/hyperv/utilities/hv_util.c
==============================================================================
--- releng/10.1/sys/dev/hyperv/utilities/hv_util.c	Fri Oct 24 07:06:01 2014	(r273580)
+++ releng/10.1/sys/dev/hyperv/utilities/hv_util.c	Fri Oct 24 07:50:34 2014	(r273581)
@@ -378,7 +378,7 @@ hv_util_probe(device_t dev)
 	    const char *p = vmbus_get_type(dev);
 	    if (service_table[i].enabled && !memcmp(p, &service_table[i].guid, sizeof(hv_guid))) {
 		device_set_softc(dev, (void *) (&service_table[i]));
-		rtn_value = 0;
+		rtn_value = BUS_PROBE_DEFAULT;
 	    }
 	}