Use BUS_PROBE_DEFAULT for pci probe return value

This commit is contained in:
Warner Losh 2005-03-05 18:10:49 +00:00
parent 99110cb6fe
commit 6b9907e7f8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=143158
12 changed files with 15 additions and 22 deletions

View File

@ -106,7 +106,7 @@ mlx_pci_probe(device_t dev)
(m->subdevice == pci_get_subdevice(dev))))) {
device_set_desc(dev, m->desc);
return(-10); /* allow room to be overridden */
return(BUS_PROBE_DEFAULT);
}
}
return(ENXIO);

View File

@ -198,11 +198,7 @@ mly_probe(device_t dev)
(m->subdevice == pci_get_subdevice(dev))))) {
device_set_desc(dev, m->desc);
#ifdef MLY_MODULE
return(-5);
#else
return(-10); /* allow room to be overridden */
#endif
return(BUS_PROBE_DEFAULT); /* allow room to be overridden */
}
}
return(ENXIO);

View File

@ -173,7 +173,7 @@ mpt_probe(device_t dev)
}
device_set_desc(dev, desc);
return (0);
return (BUS_PROBE_DEFAULT);
}
#ifdef RELENG_4

View File

@ -1424,7 +1424,7 @@ musycc_probe(device_t self)
}
device_set_desc_copy(self, desc);
return 0;
return BUS_PROBE_DEFAULT;
}
static int

View File

@ -796,7 +796,7 @@ my_probe(device_t dev)
(pci_get_device(dev) == t->my_did)) {
device_set_desc(dev, t->my_name);
my_info_tmp = t;
return (0);
return (BUS_PROBE_DEFAULT);
}
t++;
}

View File

@ -769,7 +769,7 @@ nge_probe(dev)
if ((pci_get_vendor(dev) == t->nge_vid) &&
(pci_get_device(dev) == t->nge_did)) {
device_set_desc(dev, t->nge_name);
return(0);
return(BUS_PROBE_DEFAULT);
}
t++;
}

View File

@ -151,7 +151,7 @@ patm_probe(device_t dev)
for (i = 0; devs[i].desc != NULL; i++)
if (pci_get_device(dev) == devs[i].devid) {
device_set_desc(dev, devs[i].desc);
return (0);
return (BUS_PROBE_DEFAULT);
}
}
return (ENXIO);

View File

@ -221,22 +221,19 @@ cbb_pci_probe(device_t brdev)
*/
if (cbb_chipset(pci_get_devid(brdev), &name) != CB_UNKNOWN) {
device_set_desc(brdev, name);
return (0);
return (BUS_PROBE_DEFAULT);
}
/*
* We do support generic CardBus bridges. All that we've seen
* to date have progif 0 (the Yenta spec, and successors mandate
* this). We do not support PCI PCMCIA bridges (with one exception)
* with this driver since they generally are I/O mapped. Those
* are supported by the pcic driver. This should help us be more
* future proof.
* this).
*/
subclass = pci_get_subclass(brdev);
progif = pci_get_progif(brdev);
if (subclass == PCIS_BRIDGE_CARDBUS && progif == 0) {
device_set_desc(brdev, "PCI-CardBus Bridge");
return (0);
return (BUS_PROBE_DEFAULT);
}
return (ENXIO);
}

View File

@ -98,7 +98,7 @@ pdq_pci_probe(device_t dev)
if (pci_get_vendor(dev) == DEC_VENDORID &&
pci_get_device(dev) == DEFPA_CHIPID) {
device_set_desc(dev, "Digital DEFPA PCI FDDI Controller");
return (0);
return (BUS_PROBE_DEFAULT);
}
return (ENXIO);

View File

@ -204,7 +204,7 @@ ppsopen(struct cdev *dev, int flags, int fmt, struct thread *td)
/* attach the interrupt handler */
if ((error = BUS_SETUP_INTR(ppbus, ppsdev, sc->intr_resource,
INTR_TYPE_TTY, ppsintr, ppsdev,
INTR_TYPE_TTY | INTR_FAST, ppsintr, ppsdev,
&sc->intr_cookie))) {
ppb_release_bus(ppbus, ppsdev);
return (error);

View File

@ -55,13 +55,13 @@ iop_pci_probe(device_t dev)
/* tested with actual hardware kindly donated by Promise */
if (pci_get_devid(dev) == 0x19628086 && pci_get_subvendor(dev) == 0x105a) {
device_set_desc(dev, "Promise SuperTrak SX6000 ATA RAID controller");
return 0;
return BUS_PROBE_DEFAULT;
}
/* support the older SuperTrak 100 as well */
if (pci_get_devid(dev) == 0x19608086 && pci_get_subvendor(dev) == 0x105a) {
device_set_desc(dev, "Promise SuperTrak 100 ATA RAID controller");
return 0;
return BUS_PROBE_DEFAULT;
}
return ENXIO;

View File

@ -124,7 +124,7 @@ puc_pci_probe(device_t dev)
if (desc == NULL)
return (ENXIO);
device_set_desc(dev, desc->name);
return (0);
return (BUS_PROBE_DEFAULT);
}
static int