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)
This commit is contained in:
Xin LI 2014-10-24 07:06:01 +00:00
parent bf332e7933
commit 90ab6e6584
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=273580
4 changed files with 5 additions and 5 deletions

View File

@ -218,7 +218,7 @@ netvsc_probe(device_t dev)
if (bootverbose)
printf("Netvsc probe... DONE \n");
return (0);
return (BUS_PROBE_DEFAULT);
}
return (ENXIO);

View File

@ -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

View File

@ -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;

View File

@ -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;
}
}