Author: nwhitehorn
Date: Tue Oct 29 14:19:42 2013
New Revision: 257341
URL: http://svnweb.freebsd.org/changeset/base/257341
Log:
More BUS_PROBE_NOWILDCARD sweeping. Some devices here (if_ath_ahb and siba)
resist easy conversion since they implement a great deal of their attach
logic inside probe(). Some of this could be fixed by moving it to attach(),
but some requires something more subtle than BUS_PROBE_NOWILDCARD.
Modified:
head/sys/dev/acpica/acpi.c
head/sys/dev/cfe/cfe_resource.c
head/sys/dev/gxemul/disk/gxemul_disk.c
head/sys/dev/gxemul/ether/if_gx.c
head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
head/sys/dev/rt/if_rt.c
head/sys/dev/xen/console/console.c
head/sys/dev/xen/pcifront/pcifront.c
head/sys/dev/xen/timer/timer.c
Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c Tue Oct 29 14:15:09 2013 (r257340)
+++ head/sys/dev/acpica/acpi.c Tue Oct 29 14:19:42 2013 (r257341)
@@ -431,7 +431,7 @@ acpi_probe(device_t dev)
device_set_desc(dev, acpi_desc);
- return_VALUE (0);
+ return_VALUE (BUS_PROBE_NOWILDCARD);
}
static int
Modified: head/sys/dev/cfe/cfe_resource.c
==============================================================================
--- head/sys/dev/cfe/cfe_resource.c Tue Oct 29 14:15:09 2013
(r257340)
+++ head/sys/dev/cfe/cfe_resource.c Tue Oct 29 14:19:42 2013
(r257341)
@@ -61,7 +61,7 @@ static int
cferes_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: head/sys/dev/gxemul/disk/gxemul_disk.c
==============================================================================
--- head/sys/dev/gxemul/disk/gxemul_disk.c Tue Oct 29 14:15:09 2013
(r257340)
+++ head/sys/dev/gxemul/disk/gxemul_disk.c Tue Oct 29 14:19:42 2013
(r257341)
@@ -158,7 +158,7 @@ gxemul_disk_probe(device_t dev)
{
device_set_desc(dev, "GXemul test disk");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: head/sys/dev/gxemul/ether/if_gx.c
==============================================================================
--- head/sys/dev/gxemul/ether/if_gx.c Tue Oct 29 14:15:09 2013
(r257340)
+++ head/sys/dev/gxemul/ether/if_gx.c Tue Oct 29 14:19:42 2013
(r257341)
@@ -125,7 +125,7 @@ gx_probe(device_t dev)
device_set_desc(dev, "GXemul test Ethernet");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Tue Oct 29 14:15:09
2013 (r257340)
+++ head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Tue Oct 29 14:19:42
2013 (r257341)
@@ -313,7 +313,7 @@ vmbus_probe(device_t dev) {
device_set_desc(dev, "Vmbus Devices");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
/**
Modified: head/sys/dev/rt/if_rt.c
==============================================================================
--- head/sys/dev/rt/if_rt.c Tue Oct 29 14:15:09 2013 (r257340)
+++ head/sys/dev/rt/if_rt.c Tue Oct 29 14:19:42 2013 (r257341)
@@ -149,7 +149,7 @@ static int
rt_probe(device_t dev)
{
device_set_desc(dev, "Ralink RT305XF onChip Ethernet MAC");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
/*
Modified: head/sys/dev/xen/console/console.c
==============================================================================
--- head/sys/dev/xen/console/console.c Tue Oct 29 14:15:09 2013
(r257340)
+++ head/sys/dev/xen/console/console.c Tue Oct 29 14:19:42 2013
(r257341)
@@ -226,7 +226,7 @@ static int
xc_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: head/sys/dev/xen/pcifront/pcifront.c
==============================================================================
--- head/sys/dev/xen/pcifront/pcifront.c Tue Oct 29 14:15:09 2013
(r257340)
+++ head/sys/dev/xen/pcifront/pcifront.c Tue Oct 29 14:19:42 2013
(r257341)
@@ -441,7 +441,7 @@ xpcife_probe(device_t dev)
struct pcifront_device *pdev = (struct pcifront_device
*)device_get_ivars(dev);
DPRINTF("xpcife probe (unit=%d)\n", pdev->unit);
#endif
- return 0;
+ return (BUS_PROBE_NOWILDCARD);
}
/* Newbus xpcife device driver attach */
Modified: head/sys/dev/xen/timer/timer.c
==============================================================================
--- head/sys/dev/xen/timer/timer.c Tue Oct 29 14:15:09 2013
(r257340)
+++ head/sys/dev/xen/timer/timer.c Tue Oct 29 14:19:42 2013
(r257341)
@@ -142,7 +142,7 @@ xentimer_probe(device_t dev)
"VCPUOPs interface unavailable\n");
#undef XTREQUIRES
device_set_desc(dev, "Xen PV Clock");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
/*
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
