s,KOBJMETHOD_END,DEVMETHOD_END,g in order to fully hide the explicit mention

of kobj(9) from device drivers.

27 files changed, 30 insertions, 30 deletions

diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index af10acef7561..f26945f8284a 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -14226,7 +14226,7 @@ static device_method_t bwn_methods[] = {
 	DEVMETHOD(device_detach,	bwn_detach),
 	DEVMETHOD(device_suspend,	bwn_suspend),
 	DEVMETHOD(device_resume,	bwn_resume),
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 static driver_t bwn_driver = {
 	"bwn",
diff --git a/sys/dev/esp/esp_pci.c b/sys/dev/esp/esp_pci.c
index 2fa2030659de..cd88f6bbfa5a 100644
--- a/sys/dev/esp/esp_pci.c
+++ b/sys/dev/esp/esp_pci.c
@@ -146,7 +146,7 @@ static device_method_t esp_pci_methods[] = {
 	DEVMETHOD(device_suspend,	esp_pci_suspend),
 	DEVMETHOD(device_resume,	esp_pci_resume),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t esp_pci_driver = {
diff --git a/sys/dev/esp/esp_sbus.c b/sys/dev/esp/esp_sbus.c
index c1ff021ee526..01ffb8d58fae 100644
--- a/sys/dev/esp/esp_sbus.c
+++ b/sys/dev/esp/esp_sbus.c
@@ -117,7 +117,7 @@ static device_method_t esp_dma_methods[] = {
 	DEVMETHOD(device_suspend,	esp_suspend),
 	DEVMETHOD(device_resume,	esp_resume),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t esp_dma_driver = {
@@ -136,7 +136,7 @@ static device_method_t esp_sbus_methods[] = {
 	DEVMETHOD(device_suspend,	esp_suspend),
 	DEVMETHOD(device_resume,	esp_resume),
 
-	KOBJMETHOD_END	
+	DEVMETHOD_END
 };
 
 static driver_t esp_sbus_driver = {
diff --git a/sys/dev/mii/rdcphy.c b/sys/dev/mii/rdcphy.c
index cf5db8800c47..6f7f98d5f99a 100644
--- a/sys/dev/mii/rdcphy.c
+++ b/sys/dev/mii/rdcphy.c
@@ -65,7 +65,7 @@ static device_method_t rdcphy_methods[] = {
 	DEVMETHOD(device_attach,	rdcphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t rdcphy_devclass;
diff --git a/sys/dev/ofw/ofw_iicbus.c b/sys/dev/ofw/ofw_iicbus.c
index 875e4ddb13b9..906a49f572e7 100644
--- a/sys/dev/ofw/ofw_iicbus.c
+++ b/sys/dev/ofw/ofw_iicbus.c
@@ -68,7 +68,7 @@ static device_method_t ofw_iicbus_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 struct ofw_iicbus_devinfo {
diff --git a/sys/dev/siba/siba.c b/sys/dev/siba/siba.c
index b2c49fb95c8b..ebe7190166ce 100644
--- a/sys/dev/siba/siba.c
+++ b/sys/dev/siba/siba.c
@@ -632,7 +632,7 @@ static device_method_t siba_methods[] = {
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 	DEVMETHOD(bus_write_ivar,	siba_write_ivar),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t siba_driver = {
diff --git a/sys/dev/siba/siba_bwn.c b/sys/dev/siba/siba_bwn.c
index a778d49b6150..43c52bd46c4e 100644
--- a/sys/dev/siba/siba_bwn.c
+++ b/sys/dev/siba/siba_bwn.c
@@ -410,7 +410,7 @@ static device_method_t siba_bwn_methods[] = {
 	DEVMETHOD(pci_release_msi,	siba_bwn_release_msi),
 	DEVMETHOD(pci_msi_count,	siba_bwn_msi_count),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 static driver_t siba_bwn_driver = {
 	"siba_bwn",
diff --git a/sys/dev/siba/siba_cc.c b/sys/dev/siba/siba_cc.c
index 67af696fba71..d74e809b357a 100644
--- a/sys/dev/siba/siba_cc.c
+++ b/sys/dev/siba/siba_cc.c
@@ -141,7 +141,7 @@ static device_method_t siba_cc_methods[] = {
 	DEVMETHOD(device_attach,	siba_cc_attach),
 	DEVMETHOD(device_probe,		siba_cc_probe),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t siba_cc_driver = {
diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c
index b18da275f3ca..28e9584bd57d 100644
--- a/sys/dev/stge/if_stge.c
+++ b/sys/dev/stge/if_stge.c
@@ -214,7 +214,7 @@ static device_method_t stge_methods[] = {
 	DEVMETHOD(miibus_writereg,	stge_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	stge_miibus_statchg),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t stge_driver = {
diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c
index 5e491543ce3f..591c09d20594 100644
--- a/sys/dev/vte/if_vte.c
+++ b/sys/dev/vte/if_vte.c
@@ -151,7 +151,7 @@ static device_method_t vte_methods[] = {
 	DEVMETHOD(miibus_writereg,	vte_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	vte_miibus_statchg),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t vte_driver = {
diff --git a/sys/sparc64/central/central.c b/sys/sparc64/central/central.c
index e418a8be458d..86cb3f49c87e 100644
--- a/sys/sparc64/central/central.c
+++ b/sys/sparc64/central/central.c
@@ -96,7 +96,7 @@ static device_method_t central_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t central_driver = {
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 42bac06c1919..677e31d75a91 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -181,7 +181,7 @@ static device_method_t ebus_nexus_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t ebus_nexus_driver = {
@@ -228,7 +228,7 @@ static device_method_t ebus_pci_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t ebus_pci_driver = {
diff --git a/sys/sparc64/ebus/epic.c b/sys/sparc64/ebus/epic.c
index 8c20e9402283..b32fa239ad63 100644
--- a/sys/sparc64/ebus/epic.c
+++ b/sys/sparc64/ebus/epic.c
@@ -125,7 +125,7 @@ static device_method_t epic_methods[] = {
 	DEVMETHOD(device_attach,	epic_attach),
 	DEVMETHOD(device_detach,	epic_detach),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t epic_devclass;
diff --git a/sys/sparc64/fhc/fhc.c b/sys/sparc64/fhc/fhc.c
index 0200bb1ffdb5..4d6a6bd01e85 100644
--- a/sys/sparc64/fhc/fhc.c
+++ b/sys/sparc64/fhc/fhc.c
@@ -110,7 +110,7 @@ static device_method_t fhc_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t fhc_driver = {
diff --git a/sys/sparc64/pci/apb.c b/sys/sparc64/pci/apb.c
index 7d42b7b0da7f..a6854e9a3054 100644
--- a/sys/sparc64/pci/apb.c
+++ b/sys/sparc64/pci/apb.c
@@ -96,7 +96,7 @@ static device_method_t apb_methods[] = {
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_node,	ofw_pcib_gen_get_node),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t pcib_devclass;
diff --git a/sys/sparc64/pci/ofw_pcib.c b/sys/sparc64/pci/ofw_pcib.c
index 45c9f1c9747f..69bdb7254fe0 100644
--- a/sys/sparc64/pci/ofw_pcib.c
+++ b/sys/sparc64/pci/ofw_pcib.c
@@ -74,7 +74,7 @@ static device_method_t ofw_pcib_methods[] = {
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_node,	ofw_pcib_gen_get_node),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t pcib_devclass;
diff --git a/sys/sparc64/pci/ofw_pcibus.c b/sys/sparc64/pci/ofw_pcibus.c
index 8b58ecaf7258..d753b086c35a 100644
--- a/sys/sparc64/pci/ofw_pcibus.c
+++ b/sys/sparc64/pci/ofw_pcibus.c
@@ -90,7 +90,7 @@ static device_method_t ofw_pcibus_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 struct ofw_pcibus_devinfo {
diff --git a/sys/sparc64/sbus/dma_sbus.c b/sys/sparc64/sbus/dma_sbus.c
index 8eee8da7977f..cf22569ef48d 100644
--- a/sys/sparc64/sbus/dma_sbus.c
+++ b/sys/sparc64/sbus/dma_sbus.c
@@ -134,7 +134,7 @@ static device_method_t dma_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t dma_driver = {
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index f9f78da45599..dbf1cccc813c 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -188,7 +188,7 @@ static device_method_t sbus_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t sbus_driver = {
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index e90aecb9f99e..9470bafeab54 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -91,7 +91,7 @@ static device_method_t eeprom_methods[] = {
 	DEVMETHOD(clock_gettime,	mk48txx_gettime),
 	DEVMETHOD(clock_settime,	mk48txx_settime),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t eeprom_driver = {
diff --git a/sys/sparc64/sparc64/jbusppm.c b/sys/sparc64/sparc64/jbusppm.c
index db654f00cbe4..12f9f0f34444 100644
--- a/sys/sparc64/sparc64/jbusppm.c
+++ b/sys/sparc64/sparc64/jbusppm.c
@@ -82,7 +82,7 @@ static device_method_t jbusppm_methods[] = {
 	DEVMETHOD(device_probe,		jbusppm_probe),
 	DEVMETHOD(device_attach,	jbusppm_attach),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t jbusppm_devclass;
diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c
index 041f2ff608d6..30374e53a85c 100644
--- a/sys/sparc64/sparc64/nexus.c
+++ b/sys/sparc64/sparc64/nexus.c
@@ -144,7 +144,7 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t nexus_devclass;
diff --git a/sys/sparc64/sparc64/rtc.c b/sys/sparc64/sparc64/rtc.c
index d9b0da95d4ba..3c1035455a5c 100644
--- a/sys/sparc64/sparc64/rtc.c
+++ b/sys/sparc64/sparc64/rtc.c
@@ -90,7 +90,7 @@ static device_method_t rtc_ebus_methods[] = {
 	DEVMETHOD(clock_gettime,	mc146818_gettime),
 	DEVMETHOD(clock_settime,	mc146818_settime),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t rtc_ebus_driver = {
@@ -111,7 +111,7 @@ static device_method_t rtc_isa_methods[] = {
 	DEVMETHOD(clock_gettime,	mc146818_gettime),
 	DEVMETHOD(clock_settime,	mc146818_settime),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t rtc_isa_driver = {
diff --git a/sys/sparc64/sparc64/sc_machdep.c b/sys/sparc64/sparc64/sc_machdep.c
index 107ebd20d530..f1f9a435bf70 100644
--- a/sys/sparc64/sparc64/sc_machdep.c
+++ b/sys/sparc64/sparc64/sc_machdep.c
@@ -57,7 +57,7 @@ static device_method_t sc_methods[] = {
 	DEVMETHOD(device_probe,		sc_probe),
 	DEVMETHOD(device_attach,	sc_attach),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t sc_driver = {
diff --git a/sys/sparc64/sparc64/schppm.c b/sys/sparc64/sparc64/schppm.c
index ac0ff75270d2..728d92ef77f5 100644
--- a/sys/sparc64/sparc64/schppm.c
+++ b/sys/sparc64/sparc64/schppm.c
@@ -73,7 +73,7 @@ static device_method_t schppm_methods[] = {
 	DEVMETHOD(device_probe,		schppm_probe),
 	DEVMETHOD(device_attach,	schppm_attach),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t schppm_devclass;
diff --git a/sys/sparc64/sparc64/ssm.c b/sys/sparc64/sparc64/ssm.c
index 98bd0f3a927b..8b3b11c05912 100644
--- a/sys/sparc64/sparc64/ssm.c
+++ b/sys/sparc64/sparc64/ssm.c
@@ -52,7 +52,7 @@ static device_method_t ssm_methods[] = {
 
 	/* ofw_bus interface */
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t ssm_devclass;
diff --git a/sys/sparc64/sparc64/upa.c b/sys/sparc64/sparc64/upa.c
index 1891de17e51f..cd615d90528c 100644
--- a/sys/sparc64/sparc64/upa.c
+++ b/sys/sparc64/sparc64/upa.c
@@ -147,7 +147,7 @@ static device_method_t upa_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t upa_devclass;