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/arm/mv | |
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/arm/mv')
-rw-r--r-- | sys/arm/mv/gpio.c | 3 | ||||
-rw-r--r-- | sys/arm/mv/ic.c | 3 | ||||
-rw-r--r-- | sys/arm/mv/mpic.c | 3 | ||||
-rw-r--r-- | sys/arm/mv/mv_sata.c | 3 | ||||
-rw-r--r-- | sys/arm/mv/mv_ts.c | 3 | ||||
-rw-r--r-- | sys/arm/mv/rtc.c | 3 | ||||
-rw-r--r-- | sys/arm/mv/timer.c | 3 | ||||
-rw-r--r-- | sys/arm/mv/twsi.c | 3 |
8 files changed, 24 insertions, 0 deletions
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c index 5f79bef..1bdb81b 100644 --- a/sys/arm/mv/gpio.c +++ b/sys/arm/mv/gpio.c @@ -125,6 +125,9 @@ static int mv_gpio_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,gpio")) return (ENXIO); diff --git a/sys/arm/mv/ic.c b/sys/arm/mv/ic.c index 96159a7..244b3fd 100644 --- a/sys/arm/mv/ic.c +++ b/sys/arm/mv/ic.c @@ -80,6 +80,9 @@ static int mv_ic_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,pic")) return (ENXIO); diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c index 0a1be1d..813caf4 100644 --- a/sys/arm/mv/mpic.c +++ b/sys/arm/mv/mpic.c @@ -127,6 +127,9 @@ static int mv_mpic_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,mpic")) return (ENXIO); diff --git a/sys/arm/mv/mv_sata.c b/sys/arm/mv/mv_sata.c index 87b3823..3c6d0d5 100644 --- a/sys/arm/mv/mv_sata.c +++ b/sys/arm/mv/mv_sata.c @@ -185,6 +185,9 @@ sata_probe(device_t dev) struct sata_softc *sc; uint32_t d, r; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,sata")) return (ENXIO); diff --git a/sys/arm/mv/mv_ts.c b/sys/arm/mv/mv_ts.c index ec4ee4f..7c2a113 100644 --- a/sys/arm/mv/mv_ts.c +++ b/sys/arm/mv/mv_ts.c @@ -59,6 +59,9 @@ ts_probe(device_t dev) { uint32_t d, r; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,ts")) return (ENXIO); soc_id(&d, &r); diff --git a/sys/arm/mv/rtc.c b/sys/arm/mv/rtc.c index 1605187..caa28fe 100644 --- a/sys/arm/mv/rtc.c +++ b/sys/arm/mv/rtc.c @@ -97,6 +97,9 @@ static int mv_rtc_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,rtc")) return (ENXIO); diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c index 91305b0..3c6f149 100644 --- a/sys/arm/mv/timer.c +++ b/sys/arm/mv/timer.c @@ -108,6 +108,9 @@ static int mv_timer_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,timer")) return (ENXIO); diff --git a/sys/arm/mv/twsi.c b/sys/arm/mv/twsi.c index 7b284ae..fa6f5d7 100644 --- a/sys/arm/mv/twsi.c +++ b/sys/arm/mv/twsi.c @@ -305,6 +305,9 @@ static int mv_twsi_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,twsi")) return (ENXIO); |