Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Nov 2011 21:55:40 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r227848 - in head/sys: dev/bwn dev/esp dev/mii dev/ofw dev/siba dev/stge dev/vte sparc64/central sparc64/ebus sparc64/fhc sparc64/pci sparc64/sbus sparc64/sparc64
Message-ID:  <201111222155.pAMLteHU011668@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Tue Nov 22 21:55:40 2011
New Revision: 227848
URL: http://svn.freebsd.org/changeset/base/227848

Log:
  s,KOBJMETHOD_END,DEVMETHOD_END,g in order to fully hide the explicit mention
  of kobj(9) from device drivers.

Modified:
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/esp/esp_pci.c
  head/sys/dev/esp/esp_sbus.c
  head/sys/dev/mii/rdcphy.c
  head/sys/dev/ofw/ofw_iicbus.c
  head/sys/dev/siba/siba.c
  head/sys/dev/siba/siba_bwn.c
  head/sys/dev/siba/siba_cc.c
  head/sys/dev/stge/if_stge.c
  head/sys/dev/vte/if_vte.c
  head/sys/sparc64/central/central.c
  head/sys/sparc64/ebus/ebus.c
  head/sys/sparc64/ebus/epic.c
  head/sys/sparc64/fhc/fhc.c
  head/sys/sparc64/pci/apb.c
  head/sys/sparc64/pci/ofw_pcib.c
  head/sys/sparc64/pci/ofw_pcibus.c
  head/sys/sparc64/sbus/dma_sbus.c
  head/sys/sparc64/sbus/sbus.c
  head/sys/sparc64/sparc64/eeprom.c
  head/sys/sparc64/sparc64/jbusppm.c
  head/sys/sparc64/sparc64/nexus.c
  head/sys/sparc64/sparc64/rtc.c
  head/sys/sparc64/sparc64/sc_machdep.c
  head/sys/sparc64/sparc64/schppm.c
  head/sys/sparc64/sparc64/ssm.c
  head/sys/sparc64/sparc64/upa.c

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/bwn/if_bwn.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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",

Modified: head/sys/dev/esp/esp_pci.c
==============================================================================
--- head/sys/dev/esp/esp_pci.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/esp/esp_pci.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/dev/esp/esp_sbus.c
==============================================================================
--- head/sys/dev/esp/esp_sbus.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/esp/esp_sbus.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/dev/mii/rdcphy.c
==============================================================================
--- head/sys/dev/mii/rdcphy.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/mii/rdcphy.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;

Modified: head/sys/dev/ofw/ofw_iicbus.c
==============================================================================
--- head/sys/dev/ofw/ofw_iicbus.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/ofw/ofw_iicbus.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -68,7 +68,7 @@ static device_method_t ofw_iicbus_method
 	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 {

Modified: head/sys/dev/siba/siba.c
==============================================================================
--- head/sys/dev/siba/siba.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/siba/siba.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/dev/siba/siba_bwn.c
==============================================================================
--- head/sys/dev/siba/siba_bwn.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/siba/siba_bwn.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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",

Modified: head/sys/dev/siba/siba_cc.c
==============================================================================
--- head/sys/dev/siba/siba_cc.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/siba/siba_cc.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/dev/stge/if_stge.c
==============================================================================
--- head/sys/dev/stge/if_stge.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/stge/if_stge.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/dev/vte/if_vte.c
==============================================================================
--- head/sys/dev/vte/if_vte.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/dev/vte/if_vte.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/central/central.c
==============================================================================
--- head/sys/sparc64/central/central.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/central/central.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/ebus/ebus.c
==============================================================================
--- head/sys/sparc64/ebus/ebus.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/ebus/ebus.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -181,7 +181,7 @@ static device_method_t ebus_nexus_method
 	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 = {

Modified: head/sys/sparc64/ebus/epic.c
==============================================================================
--- head/sys/sparc64/ebus/epic.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/ebus/epic.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;

Modified: head/sys/sparc64/fhc/fhc.c
==============================================================================
--- head/sys/sparc64/fhc/fhc.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/fhc/fhc.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/pci/apb.c
==============================================================================
--- head/sys/sparc64/pci/apb.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/pci/apb.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;

Modified: head/sys/sparc64/pci/ofw_pcib.c
==============================================================================
--- head/sys/sparc64/pci/ofw_pcib.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/pci/ofw_pcib.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;

Modified: head/sys/sparc64/pci/ofw_pcibus.c
==============================================================================
--- head/sys/sparc64/pci/ofw_pcibus.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/pci/ofw_pcibus.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -90,7 +90,7 @@ static device_method_t ofw_pcibus_method
 	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 {

Modified: head/sys/sparc64/sbus/dma_sbus.c
==============================================================================
--- head/sys/sparc64/sbus/dma_sbus.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sbus/dma_sbus.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/sbus/sbus.c
==============================================================================
--- head/sys/sparc64/sbus/sbus.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sbus/sbus.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/sparc64/eeprom.c
==============================================================================
--- head/sys/sparc64/sparc64/eeprom.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/eeprom.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/sparc64/jbusppm.c
==============================================================================
--- head/sys/sparc64/sparc64/jbusppm.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/jbusppm.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;

Modified: head/sys/sparc64/sparc64/nexus.c
==============================================================================
--- head/sys/sparc64/sparc64/nexus.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/nexus.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;

Modified: head/sys/sparc64/sparc64/rtc.c
==============================================================================
--- head/sys/sparc64/sparc64/rtc.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/rtc.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/sparc64/sc_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/sc_machdep.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/sc_machdep.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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 = {

Modified: head/sys/sparc64/sparc64/schppm.c
==============================================================================
--- head/sys/sparc64/sparc64/schppm.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/schppm.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;

Modified: head/sys/sparc64/sparc64/ssm.c
==============================================================================
--- head/sys/sparc64/sparc64/ssm.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/ssm.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -52,7 +52,7 @@ static device_method_t ssm_methods[] = {
 
 	/* ofw_bus interface */
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t ssm_devclass;

Modified: head/sys/sparc64/sparc64/upa.c
==============================================================================
--- head/sys/sparc64/sparc64/upa.c	Tue Nov 22 21:53:19 2011	(r227847)
+++ head/sys/sparc64/sparc64/upa.c	Tue Nov 22 21:55:40 2011	(r227848)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111222155.pAMLteHU011668>