diff options
| author | ian <ian@FreeBSD.org> | 2014-05-15 16:11:06 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-15 16:11:06 +0000 |
| commit | 20a269e6c7378fda94043f8419c9becbde7f427a (patch) | |
| tree | 675ee07ce869e3193726664b9896e280b0c03239 /sys/dev/altera | |
| parent | ffa1dc9425d9681f0da92d9266010bcc0f81d399 (diff) | |
| download | FreeBSD-src-20a269e6c7378fda94043f8419c9becbde7f427a.zip FreeBSD-src-20a269e6c7378fda94043f8419c9becbde7f427a.tar.gz | |
MFC r261410
Follow r261352 by updating all drivers which are children of simplebus
to check the status property in their probe routines.
Diffstat (limited to 'sys/dev/altera')
| -rw-r--r-- | sys/dev/altera/atse/if_atse_fdt.c | 3 | ||||
| -rw-r--r-- | sys/dev/altera/avgen/altera_avgen_fdt.c | 3 | ||||
| -rw-r--r-- | sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c | 3 | ||||
| -rw-r--r-- | sys/dev/altera/sdcard/altera_sdcard_fdt.c | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/altera/atse/if_atse_fdt.c b/sys/dev/altera/atse/if_atse_fdt.c index 30c6b67..31dae9e 100644 --- a/sys/dev/altera/atse/if_atse_fdt.c +++ b/sys/dev/altera/atse/if_atse_fdt.c @@ -64,6 +64,9 @@ static int atse_probe_fdt(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "altera,atse")) { device_set_desc(dev, "Altera Triple-Speed Ethernet MegaCore"); return (BUS_PROBE_DEFAULT); diff --git a/sys/dev/altera/avgen/altera_avgen_fdt.c b/sys/dev/altera/avgen/altera_avgen_fdt.c index 2762ff4..d87027d 100644 --- a/sys/dev/altera/avgen/altera_avgen_fdt.c +++ b/sys/dev/altera/avgen/altera_avgen_fdt.c @@ -62,6 +62,9 @@ static int altera_avgen_fdt_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "sri-cambridge,avgen")) { device_set_desc(dev, "Generic Altera Avalon device attachment"); return (BUS_PROBE_DEFAULT); diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c index 47f39a4..c4ee8de 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c @@ -64,6 +64,9 @@ static int altera_jtag_uart_fdt_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "altera,jtag_uart-11_0")) { device_set_desc(dev, "Altera JTAG UART"); return (BUS_PROBE_DEFAULT); diff --git a/sys/dev/altera/sdcard/altera_sdcard_fdt.c b/sys/dev/altera/sdcard/altera_sdcard_fdt.c index 027ca2d..da77aef 100644 --- a/sys/dev/altera/sdcard/altera_sdcard_fdt.c +++ b/sys/dev/altera/sdcard/altera_sdcard_fdt.c @@ -64,6 +64,9 @@ static int altera_sdcard_fdt_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "altera,sdcard_11_2011")) { device_set_desc(dev, "Altera Secure Data Card IP Core"); return (BUS_PROBE_DEFAULT); |
