diff options
| -rw-r--r-- | sys/dev/mlx/mlx_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/mly/mly.c | 6 | ||||
| -rw-r--r-- | sys/dev/mpt/mpt_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/musycc/musycc.c | 2 | ||||
| -rw-r--r-- | sys/dev/my/if_my.c | 2 | ||||
| -rw-r--r-- | sys/dev/nge/if_nge.c | 2 | ||||
| -rw-r--r-- | sys/dev/patm/if_patm_attach.c | 2 | ||||
| -rw-r--r-- | sys/dev/pccbb/pccbb_pci.c | 9 | ||||
| -rw-r--r-- | sys/dev/pdq/if_fpa.c | 2 | ||||
| -rw-r--r-- | sys/dev/ppbus/pps.c | 2 | ||||
| -rw-r--r-- | sys/dev/pst/pst-pci.c | 4 | ||||
| -rw-r--r-- | sys/dev/puc/puc_pci.c | 2 |
12 files changed, 15 insertions, 22 deletions
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c index f3309277fb63..6c2fe87e6e93 100644 --- a/sys/dev/mlx/mlx_pci.c +++ b/sys/dev/mlx/mlx_pci.c @@ -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); diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c index 2e368164b604..c7fa06844aa2 100644 --- a/sys/dev/mly/mly.c +++ b/sys/dev/mly/mly.c @@ -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); diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c index f9054f084b1c..cdb128747e82 100644 --- a/sys/dev/mpt/mpt_pci.c +++ b/sys/dev/mpt/mpt_pci.c @@ -173,7 +173,7 @@ mpt_probe(device_t dev) } device_set_desc(dev, desc); - return (0); + return (BUS_PROBE_DEFAULT); } #ifdef RELENG_4 diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c index 62615e57f941..d9503f915815 100644 --- a/sys/dev/musycc/musycc.c +++ b/sys/dev/musycc/musycc.c @@ -1424,7 +1424,7 @@ musycc_probe(device_t self) } device_set_desc_copy(self, desc); - return 0; + return BUS_PROBE_DEFAULT; } static int diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c index 0c8fa1d5719e..c9835e55e62c 100644 --- a/sys/dev/my/if_my.c +++ b/sys/dev/my/if_my.c @@ -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++; } diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index 1958301546be..dcd2516ec854 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -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++; } diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c index f7847250d2ae..283d18b8a1da 100644 --- a/sys/dev/patm/if_patm_attach.c +++ b/sys/dev/patm/if_patm_attach.c @@ -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); diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c index b5e9c0742276..61c27f5a8253 100644 --- a/sys/dev/pccbb/pccbb_pci.c +++ b/sys/dev/pccbb/pccbb_pci.c @@ -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); } diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c index e8082f51e056..cfb6f89fc48d 100644 --- a/sys/dev/pdq/if_fpa.c +++ b/sys/dev/pdq/if_fpa.c @@ -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); diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c index bf7c08b41ece..2a0cb491caed 100644 --- a/sys/dev/ppbus/pps.c +++ b/sys/dev/ppbus/pps.c @@ -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); diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c index 9d97280ee62d..c5f4a8592160 100644 --- a/sys/dev/pst/pst-pci.c +++ b/sys/dev/pst/pst-pci.c @@ -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; diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c index 8ae0f73124d6..2be23cf5c16d 100644 --- a/sys/dev/puc/puc_pci.c +++ b/sys/dev/puc/puc_pci.c @@ -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 |