summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2011-11-22 21:55:40 +0000
committermarius <marius@FreeBSD.org>2011-11-22 21:55:40 +0000
commit1b8636b892354196b19384bfe65b6f16ca825c20 (patch)
treea76b6a370d61cdfa3d0335a05c8e3bb1cf84e719
parent9eef52e077729e443302cd2d402467b679c1fd22 (diff)
downloadFreeBSD-src-1b8636b892354196b19384bfe65b6f16ca825c20.zip
FreeBSD-src-1b8636b892354196b19384bfe65b6f16ca825c20.tar.gz
s,KOBJMETHOD_END,DEVMETHOD_END,g in order to fully hide the explicit mention
of kobj(9) from device drivers.
-rw-r--r--sys/dev/bwn/if_bwn.c2
-rw-r--r--sys/dev/esp/esp_pci.c2
-rw-r--r--sys/dev/esp/esp_sbus.c4
-rw-r--r--sys/dev/mii/rdcphy.c2
-rw-r--r--sys/dev/ofw/ofw_iicbus.c2
-rw-r--r--sys/dev/siba/siba.c2
-rw-r--r--sys/dev/siba/siba_bwn.c2
-rw-r--r--sys/dev/siba/siba_cc.c2
-rw-r--r--sys/dev/stge/if_stge.c2
-rw-r--r--sys/dev/vte/if_vte.c2
-rw-r--r--sys/sparc64/central/central.c2
-rw-r--r--sys/sparc64/ebus/ebus.c4
-rw-r--r--sys/sparc64/ebus/epic.c2
-rw-r--r--sys/sparc64/fhc/fhc.c2
-rw-r--r--sys/sparc64/pci/apb.c2
-rw-r--r--sys/sparc64/pci/ofw_pcib.c2
-rw-r--r--sys/sparc64/pci/ofw_pcibus.c2
-rw-r--r--sys/sparc64/sbus/dma_sbus.c2
-rw-r--r--sys/sparc64/sbus/sbus.c2
-rw-r--r--sys/sparc64/sparc64/eeprom.c2
-rw-r--r--sys/sparc64/sparc64/jbusppm.c2
-rw-r--r--sys/sparc64/sparc64/nexus.c2
-rw-r--r--sys/sparc64/sparc64/rtc.c4
-rw-r--r--sys/sparc64/sparc64/sc_machdep.c2
-rw-r--r--sys/sparc64/sparc64/schppm.c2
-rw-r--r--sys/sparc64/sparc64/ssm.c2
-rw-r--r--sys/sparc64/sparc64/upa.c2
27 files changed, 30 insertions, 30 deletions
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index af10ace..f26945f 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 2fa2030..cd88f6b 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 c1ff021..01ffb8d 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 cf5db88..6f7f98d 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 875e4dd..906a49f 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 b2c49fb..ebe7190 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 a778d49..43c52bd 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 67af696..d74e809b 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 b18da27..28e9584 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 5e49154..591c09d 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 e418a8b..86cb3f4 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 42bac06..677e31d 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 8c20e94..b32fa23 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 0200bb1..4d6a6bd 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 7d42b7b..a6854e9 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 45c9f1c..69bdb72 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 8b58eca..d753b08 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 8eee8da..cf22569 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 f9f78da..dbf1ccc 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 e90aecb..9470baf 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 db654f0..12f9f0f 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 041f2ff..30374e5 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 d9b0da9..3c10354 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 107ebd2..f1f9a43 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 ac0ff75..728d92e 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 98bd0f3..8b3b11c 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 1891de1..cd615d9 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;
OpenPOWER on IntegriCloud