svn commit: r273577 - in head/sys/dev/hyperv: netvsc stordisengage storvsc utilities
Xin LI
delphij at FreeBSD.org
Fri Oct 24 06:27:47 UTC 2014
Author: delphij
Date: Fri Oct 24 06:27:45 2014
New Revision: 273577
URL: https://svnweb.freebsd.org/changeset/base/273577
Log:
Return BUS_PROBE_DEFAULT instead of BUS_PROBE_VENDOR or 0 for in-tree
driver. This change was verified by Microsoft.
Modified:
head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
head/sys/dev/hyperv/utilities/hv_util.c
Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Fri Oct 24 05:39:32 2014 (r273576)
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Fri Oct 24 06:27:45 2014 (r273577)
@@ -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: head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
==============================================================================
--- head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Fri Oct 24 05:39:32 2014 (r273576)
+++ head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Fri Oct 24 06:27:45 2014 (r273577)
@@ -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: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Fri Oct 24 05:39:32 2014 (r273576)
+++ head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Fri Oct 24 06:27:45 2014 (r273577)
@@ -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: head/sys/dev/hyperv/utilities/hv_util.c
==============================================================================
--- head/sys/dev/hyperv/utilities/hv_util.c Fri Oct 24 05:39:32 2014 (r273576)
+++ head/sys/dev/hyperv/utilities/hv_util.c Fri Oct 24 06:27:45 2014 (r273577)
@@ -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;
}
}
More information about the svn-src-all
mailing list