19 files changed, 30 insertions, 19 deletions

diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index 0ada1c7a5a52..4fd4ee601f77 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -362,3 +362,4 @@ static devclass_t aha_devclass;
 
 DRIVER_MODULE(aha, isa, aha_isa_driver, aha_devclass, 0, 0);
 MODULE_DEPEND(aha, isa, 1, 1, 1);
+ISA_PNP_INFO(aha_ids);
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index 3258269acded..b4161591e195 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.c
@@ -242,3 +242,4 @@ extern devclass_t aic_devclass;
 
 MODULE_DEPEND(aic, cam, 1,1,1);
 DRIVER_MODULE(aic, isa, aic_isa_driver, aic_devclass, 0, 0);
+ISA_PNP_INFO(aic_ids);
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index a6d3c81d52da..627bfaa04e6d 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -150,3 +150,4 @@ static devclass_t an_isa_devclass;
 DRIVER_MODULE(an, isa, an_isa_driver, an_isa_devclass, 0, 0);
 MODULE_DEPEND(an, isa, 1, 1, 1);
 MODULE_DEPEND(an, wlan, 1, 1, 1);
+ISA_PNP_INFO(an_ids);
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index d83d7ac8bb9b..d06d449eabed 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -322,3 +322,4 @@ atkbdc_isa_release_resource(device_t dev, device_t child, int type, int rid,
 
 DRIVER_MODULE(atkbdc, isa, atkbdc_isa_driver, atkbdc_devclass, 0, 0);
 DRIVER_MODULE(atkbdc, acpi, atkbdc_isa_driver, atkbdc_devclass, 0, 0);
+ISA_PNP_INFO(atkbdc_ids);
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 55446238875f..4b1e5d7ba0f8 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -120,3 +120,4 @@ extern devclass_t cs_devclass;
 DRIVER_MODULE(cs, isa, cs_isa_driver, cs_devclass, 0, 0);
 MODULE_DEPEND(cs, isa, 1, 1, 1);
 MODULE_DEPEND(cs, ether, 1, 1, 1);
+ISA_PNP_INFO(cs_ids);
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index ac36f4060b87..7cf15817a0ba 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -203,6 +203,4 @@ static driver_t ed_isa_driver = {
 DRIVER_MODULE(ed, isa, ed_isa_driver, ed_devclass, 0, 0);
 MODULE_DEPEND(ed, isa, 1, 1, 1);
 MODULE_DEPEND(ed, ether, 1, 1, 1);
-MODULE_PNP_INFO("E:pnpid;", isa, ed, ed_ids, sizeof(ed_ids[0]),
-    nitems(ed_ids) - 1);
-
+ISA_PNP_INFO(ed_ids);
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index c904e609e6f8..6e858edf85f9 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -395,3 +395,4 @@ DRIVER_MODULE(ep, isa, ep_isa_driver, ep_devclass, 0, 0);
 #ifdef __i386__
 MODULE_DEPEND(ep, elink, 1, 1, 1);
 #endif
+ISA_PNP_INFO(ep_ids);
diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c
index ab572fff1ef5..2b0cd0a9f9dd 100644
--- a/sys/dev/ex/if_ex_isa.c
+++ b/sys/dev/ex/if_ex_isa.c
@@ -82,8 +82,6 @@ static driver_t ex_isa_driver = {
 	sizeof(struct ex_softc),
 };
 
-DRIVER_MODULE(ex, isa, ex_isa_driver, ex_devclass, 0, 0);
-
 static struct isa_pnp_id ex_ids[] = {
 	{ 0x3110d425,	NULL },	/* INT1031 */
 	{ 0x3010d425,	NULL },	/* INT1030 */
@@ -337,3 +335,6 @@ ex_look_for_card(struct ex_softc *sc)
 
 	return((count2 & Counter_bits) == ((count1 + 0xc0) & Counter_bits));
 }
+
+DRIVER_MODULE(ex, isa, ex_isa_driver, ex_devclass, 0, 0);
+ISA_PNP_INFO(ex_ids);
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index 55d9c85ca9c2..ab03c78a691e 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -224,3 +224,4 @@ static driver_t fdc_driver = {
 };
 
 DRIVER_MODULE(fdc, isa, fdc_driver, fdc_devclass, 0, 0);
+ISA_PNP_INFO(fdc_ids);
diff --git a/sys/dev/fe/if_fe_isa.c b/sys/dev/fe/if_fe_isa.c
index 092f30eef6df..c30c9340fc1c 100644
--- a/sys/dev/fe/if_fe_isa.c
+++ b/sys/dev/fe/if_fe_isa.c
@@ -68,9 +68,6 @@ static driver_t fe_isa_driver = {
 	sizeof (struct fe_softc)
 };
 
-DRIVER_MODULE(fe, isa, fe_isa_driver, fe_devclass, 0, 0);
-
-
 static int fe_probe_ssi(device_t);
 static int fe_probe_jli(device_t);
 static int fe_probe_fmv(device_t);
@@ -1062,3 +1059,5 @@ fe_probe_ubn(device_t dev)
 
 	return 0;
 }
+
+DRIVER_MODULE(fe, isa, fe_isa_driver, fe_devclass, 0, 0);
diff --git a/sys/dev/joy/joy_isa.c b/sys/dev/joy/joy_isa.c
index 483279e69147..c09c8444c9c4 100644
--- a/sys/dev/joy/joy_isa.c
+++ b/sys/dev/joy/joy_isa.c
@@ -85,3 +85,4 @@ static driver_t joy_isa_driver = {
 
 DRIVER_MODULE(joy, isa, joy_isa_driver, joy_devclass, 0, 0);
 DRIVER_MODULE(joy, acpi, joy_isa_driver, joy_devclass, 0, 0);
+ISA_PNP_INFO(joy_ids);
diff --git a/sys/dev/le/if_le_isa.c b/sys/dev/le/if_le_isa.c
index ba0fc098d1f9..39d5e111bdcc 100644
--- a/sys/dev/le/if_le_isa.c
+++ b/sys/dev/le/if_le_isa.c
@@ -135,10 +135,6 @@ static device_method_t le_isa_methods[] = {
 	{ 0, 0 }
 };
 
-DEFINE_CLASS_0(le, le_isa_driver, le_isa_methods, sizeof(struct le_isa_softc));
-DRIVER_MODULE(le, isa, le_isa_driver, le_devclass, 0, 0);
-MODULE_DEPEND(le, ether, 1, 1, 1);
-
 struct le_isa_param {
 	const char	*name;
 	u_long		iosize;
@@ -496,3 +492,8 @@ le_isa_resume(device_t dev)
 
 	return (0);
 }
+
+DEFINE_CLASS_0(le, le_isa_driver, le_isa_methods, sizeof(struct le_isa_softc));
+DRIVER_MODULE(le, isa, le_isa_driver, le_devclass, 0, 0);
+MODULE_DEPEND(le, ether, 1, 1, 1);
+ISA_PNP_INFO(le_isa_ids);
diff --git a/sys/dev/mse/mse_isa.c b/sys/dev/mse/mse_isa.c
index ca4c3a8fe511..5013926c3ebe 100644
--- a/sys/dev/mse/mse_isa.c
+++ b/sys/dev/mse/mse_isa.c
@@ -107,8 +107,6 @@ static	driver_t	mse_driver = {
 	sizeof(mse_softc_t),
 };
 
-DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
-
 static struct isa_pnp_id mse_ids[] = {
 	{ 0x000fd041, "Bus mouse" },			/* PNP0F00 */
 	{ 0x020fd041, "InPort mouse" },			/* PNP0F02 */
@@ -390,3 +388,6 @@ mse_getati(struct resource *port, int *dx, int *dy, int *but)
 	bus_write_1(port, MSE_PORTA, MSE_INPORT_MODE);
 	bus_write_1(port, MSE_PORTB, MSE_INPORT_INTREN);
 }
+
+DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
+ISA_PNP_INFO(mse_ids);
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index c6fc94245a06..573c5ec3f4ab 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -103,7 +103,7 @@ struct pccard_product {
  */
 #define PCCARD_PNP_DESCR "D:#;V32:manufacturer;V32:product;Z:cisvendor;Z:cisproduct;"
 #define PCCARD_PNP_INFO(t) \
-	MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]), sizeof(t) / sizeof(t[0]) - 1); \
+	MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]), nitems(t) - 1); \
 
 typedef int (*pccard_product_match_fn) (device_t dev,
     const struct pccard_product *ent, int vpfmatch);
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index 0b139bf75f2c..cb50adf9a23b 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -106,7 +106,6 @@ SYSCTL_INT(_hw_pcic, OID_AUTO, pd6722_vsense, CTLFLAG_RDTUN,
 #define	DPRINTF(x) do { if (cbb_debug) printf x; } while (0)
 #define	DEVPRINTF(x) do { if (cbb_debug) device_printf x; } while (0)
 
-/* XXX Not sure that PNP0E03 should be claimed, except maybe on pc98 */
 static struct isa_pnp_id pcic_ids[] = {
 	{EXCA_PNP_ACTIONTEC,		NULL},		/* AEI0218 */
 	{EXCA_PNP_IBM3765,		NULL},		/* IBM3765 */
@@ -255,3 +254,4 @@ static driver_t cbb_isa_driver = {
 
 DRIVER_MODULE(cbb, isa, cbb_isa_driver, cbb_devclass, 0, 0);
 MODULE_DEPEND(cbb, exca, 1, 1, 1);
+ISA_PNP_INFO(pcic_ids);
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index 96bfc9bd18af..fb23a8104ee0 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -274,3 +274,4 @@ error:
 }
 
 DRIVER_MODULE(ppc, isa, ppc_isa_driver, ppc_devclass, 0, 0);
+ISA_PNP_INFO(lpc_ids);
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index f1db8b1a984c..9a922b8ec24c 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -71,9 +71,6 @@ static struct isa_pnp_id  sbni_ids[] = {
 	{ 0, NULL }	/* we have no pnp sbni cards atm.  */
 };
 
-DRIVER_MODULE(sbni, isa, sbni_isa_driver, sbni_isa_devclass, 0, 0);
-MODULE_DEPEND(sbni, isa, 1, 1, 1);
-
 static int
 sbni_probe_isa(device_t dev)
 {
@@ -166,3 +163,6 @@ sbni_attach_isa(device_t dev)
 
 	return (0);
 }
+
+DRIVER_MODULE(sbni, isa, sbni_isa_driver, sbni_isa_devclass, 0, 0);
+MODULE_DEPEND(sbni, isa, 1, 1, 1);
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index 8c9fae891828..bef2a9ab9fa8 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -175,3 +175,4 @@ DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0);
 #ifndef COM_NO_ACPI
 DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0);
 #endif
+ISA_PNP_INFO(sio_ids);
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 8d80f88a9107..759d4f92a9a9 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -172,3 +172,4 @@ uart_isa_probe(device_t dev)
 }
 
 DRIVER_MODULE(uart, isa, uart_isa_driver, uart_devclass, 0, 0);
+ISA_PNP_INFO(isa_ns8250_ids);