From ae2bbb5100a71ca9712eebe64ce4a80b680f030b Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 14 May 2014 01:35:43 +0000 Subject: MFC r257334, r257336, r257337, r257338, r257341, r257342, r257343, r257370, r257368, r257416 Hints-only devices should return BUS_PROBE_NOWILDCARD from their probe methods. --- sys/mips/adm5120/obio.c | 2 +- sys/mips/alchemy/obio.c | 2 +- sys/mips/atheros/apb.c | 2 +- sys/mips/atheros/ar71xx_ehci.c | 2 +- sys/mips/atheros/ar71xx_pci.c | 2 +- sys/mips/atheros/ar71xx_spi.c | 2 +- sys/mips/atheros/ar71xx_wdog.c | 2 +- sys/mips/atheros/ar724x_pci.c | 2 +- sys/mips/atheros/if_arge.c | 2 +- sys/mips/cavium/ciu.c | 2 +- sys/mips/cavium/octeon_ebt3000_cf.c | 2 +- sys/mips/cavium/octeon_pmc.c | 2 +- sys/mips/cavium/octeon_rnd.c | 2 +- sys/mips/cavium/octeon_rtc.c | 2 +- sys/mips/idt/obio.c | 2 +- sys/mips/malta/gt.c | 2 +- sys/mips/mips/tick.c | 2 +- sys/mips/nlm/tick.c | 2 +- sys/mips/nlm/xlp_pci.c | 5 +++-- sys/mips/rmi/iodi.c | 2 +- sys/mips/rmi/tick.c | 2 +- sys/mips/rt305x/obio.c | 2 +- sys/mips/sibyte/sb_zbbus.c | 2 +- 23 files changed, 25 insertions(+), 24 deletions(-) (limited to 'sys/mips') diff --git a/sys/mips/adm5120/obio.c b/sys/mips/adm5120/obio.c index b89c957..788e3a8 100644 --- a/sys/mips/adm5120/obio.c +++ b/sys/mips/adm5120/obio.c @@ -157,7 +157,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/alchemy/obio.c b/sys/mips/alchemy/obio.c index 90e41d6..da05bbb 100644 --- a/sys/mips/alchemy/obio.c +++ b/sys/mips/alchemy/obio.c @@ -158,7 +158,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c index 94cb1aa..fd1bc68 100644 --- a/sys/mips/atheros/apb.c +++ b/sys/mips/atheros/apb.c @@ -103,7 +103,7 @@ static int apb_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c index d3bb5f6..cc92d8a 100644 --- a/sys/mips/atheros/ar71xx_ehci.c +++ b/sys/mips/atheros/ar71xx_ehci.c @@ -75,7 +75,7 @@ ar71xx_ehci_probe(device_t self) device_set_desc(self, EHCI_HC_DEVSTR); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c index 9b88f60..476dba2 100644 --- a/sys/mips/atheros/ar71xx_pci.c +++ b/sys/mips/atheros/ar71xx_pci.c @@ -371,7 +371,7 @@ static int ar71xx_pci_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_spi.c b/sys/mips/atheros/ar71xx_spi.c index 095f930..2391927 100644 --- a/sys/mips/atheros/ar71xx_spi.c +++ b/sys/mips/atheros/ar71xx_spi.c @@ -84,7 +84,7 @@ static int ar71xx_spi_probe(device_t dev) { device_set_desc(dev, "AR71XX SPI"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/ar71xx_wdog.c b/sys/mips/atheros/ar71xx_wdog.c index d582f18..bf1ebc6 100644 --- a/sys/mips/atheros/ar71xx_wdog.c +++ b/sys/mips/atheros/ar71xx_wdog.c @@ -92,7 +92,7 @@ ar71xx_wdog_probe(device_t dev) { device_set_desc(dev, "Atheros AR71XX watchdog timer"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c index e73e9fc..c481b6a 100644 --- a/sys/mips/atheros/ar724x_pci.c +++ b/sys/mips/atheros/ar724x_pci.c @@ -349,7 +349,7 @@ static int ar724x_pci_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c index aabab52..85a22c3 100644 --- a/sys/mips/atheros/if_arge.c +++ b/sys/mips/atheros/if_arge.c @@ -260,7 +260,7 @@ arge_probe(device_t dev) { device_set_desc(dev, "Atheros AR71xx built-in ethernet interface"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c index dab1621..a9b1f98 100644 --- a/sys/mips/cavium/ciu.c +++ b/sys/mips/cavium/ciu.c @@ -109,7 +109,7 @@ ciu_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Central Interrupt Unit"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/cavium/octeon_ebt3000_cf.c b/sys/mips/cavium/octeon_ebt3000_cf.c index 287005b..18db10f 100644 --- a/sys/mips/cavium/octeon_ebt3000_cf.c +++ b/sys/mips/cavium/octeon_ebt3000_cf.c @@ -599,7 +599,7 @@ static int cf_probe (device_t dev) device_set_desc(dev, "Octeon Compact Flash Driver"); - return (0); + return (BUS_PROBE_NOWILDCARD); } /* ------------------------------------------------------------------- * diff --git a/sys/mips/cavium/octeon_pmc.c b/sys/mips/cavium/octeon_pmc.c index 0448018..688b154 100644 --- a/sys/mips/cavium/octeon_pmc.c +++ b/sys/mips/cavium/octeon_pmc.c @@ -71,7 +71,7 @@ octeon_pmc_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Performance Counters"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/cavium/octeon_rnd.c b/sys/mips/cavium/octeon_rnd.c index 27a7078..9419314 100644 --- a/sys/mips/cavium/octeon_rnd.c +++ b/sys/mips/cavium/octeon_rnd.c @@ -86,7 +86,7 @@ octeon_rnd_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Random Number Generator"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/cavium/octeon_rtc.c b/sys/mips/cavium/octeon_rtc.c index ca2debd..b08d4db5 100644 --- a/sys/mips/cavium/octeon_rtc.c +++ b/sys/mips/cavium/octeon_rtc.c @@ -81,7 +81,7 @@ octeon_rtc_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Realtime Clock"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/idt/obio.c b/sys/mips/idt/obio.c index 034b93a..b7b917d 100644 --- a/sys/mips/idt/obio.c +++ b/sys/mips/idt/obio.c @@ -108,7 +108,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c index ce320c9..b9cff7d 100644 --- a/sys/mips/malta/gt.c +++ b/sys/mips/malta/gt.c @@ -51,7 +51,7 @@ static int gt_probe(device_t dev) { device_set_desc(dev, "GT64120 chip"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c index 1dc3e7a..82620ae 100644 --- a/sys/mips/mips/tick.c +++ b/sys/mips/mips/tick.c @@ -313,7 +313,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/nlm/tick.c b/sys/mips/nlm/tick.c index b5a8c36..47c6b34 100644 --- a/sys/mips/nlm/tick.c +++ b/sys/mips/nlm/tick.c @@ -318,7 +318,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c index 23bd46c..71f1d19 100644 --- a/sys/mips/nlm/xlp_pci.c +++ b/sys/mips/nlm/xlp_pci.c @@ -383,8 +383,7 @@ xlp_pcib_probe(device_t dev) { device_set_desc(dev, "XLP PCI bus"); - xlp_pcib_init_resources(); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int @@ -524,6 +523,8 @@ xlp_pcib_attach(device_t dev) { int node, link; + xlp_pcib_init_resources(); + /* enable hardware swap on all nodes/links */ for (node = 0; node < XLP_MAX_NODES; node++) for (link = 0; link < 4; link++) diff --git a/sys/mips/rmi/iodi.c b/sys/mips/rmi/iodi.c index 8952fcd..a286589 100644 --- a/sys/mips/rmi/iodi.c +++ b/sys/mips/rmi/iodi.c @@ -190,7 +190,7 @@ static void iodi_identify(driver_t *, device_t); int iodi_probe(device_t dev) { - return 0; + return (BUS_PROBE_NOWILDCARD); } void diff --git a/sys/mips/rmi/tick.c b/sys/mips/rmi/tick.c index adc8c89..f6d0458 100644 --- a/sys/mips/rmi/tick.c +++ b/sys/mips/rmi/tick.c @@ -315,7 +315,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void diff --git a/sys/mips/rt305x/obio.c b/sys/mips/rt305x/obio.c index 870afea..fd9132a 100644 --- a/sys/mips/rt305x/obio.c +++ b/sys/mips/rt305x/obio.c @@ -148,7 +148,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int diff --git a/sys/mips/sibyte/sb_zbbus.c b/sys/mips/sibyte/sb_zbbus.c index e166b8f..b96409b 100644 --- a/sys/mips/sibyte/sb_zbbus.c +++ b/sys/mips/sibyte/sb_zbbus.c @@ -207,7 +207,7 @@ zbbus_probe(device_t dev) { device_set_desc(dev, "Broadcom/Sibyte ZBbus"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int -- cgit v1.1