From 90ab6e65845457ff5fe9e97f3a347fe7f44875a1 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Fri, 24 Oct 2014 07:06:01 +0000 Subject: [PATCH] MFC r273577: Return BUS_PROBE_DEFAULT instead of BUS_PROBE_VENDOR or 0 for in-tree driver. This change was verified by Microsoft. Instant MFC approved by: re (kib) --- sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c | 2 +- sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c | 2 +- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 4 ++-- sys/dev/hyperv/utilities/hv_util.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c index ba3eac429b44..1f5fc3db6c20 100644 --- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c +++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c @@ -218,7 +218,7 @@ netvsc_probe(device_t dev) if (bootverbose) printf("Netvsc probe... DONE \n"); - return (0); + return (BUS_PROBE_DEFAULT); } return (ENXIO); diff --git a/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c index 323b4e73acc8..802202670829 100644 --- a/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c +++ b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c @@ -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 diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index 2a8043ddcd28..de5b43e3cb14 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -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; diff --git a/sys/dev/hyperv/utilities/hv_util.c b/sys/dev/hyperv/utilities/hv_util.c index 91bbc5345ad5..3e545cff50c3 100644 --- a/sys/dev/hyperv/utilities/hv_util.c +++ b/sys/dev/hyperv/utilities/hv_util.c @@ -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; } }