- There's no need to overwrite the default device method with the default

  one. Interestingly, these are actually the default for quite some time
  (bus_generic_driver_added(9) since r52045 and bus_generic_print_child(9)
  since r52045) but even recently added device drivers do this unnecessarily.
  Discussed with: jhb, marcel
- While at it, use DEVMETHOD_END.
  Discussed with: jhb
- Also while at it, use __FBSDID.

4 files changed, 8 insertions, 12 deletions

diff --git a/sys/dev/scc/scc_bfe_ebus.c b/sys/dev/scc/scc_bfe_ebus.c
index 6c944f7..2b71a67 100644
--- a/sys/dev/scc/scc_bfe_ebus.c
+++ b/sys/dev/scc/scc_bfe_ebus.c
@@ -84,9 +84,8 @@ static device_method_t scc_ebus_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_ebus_driver = {
diff --git a/sys/dev/scc/scc_bfe_macio.c b/sys/dev/scc/scc_bfe_macio.c
index 1d7bf82..042788d 100644
--- a/sys/dev/scc/scc_bfe_macio.c
+++ b/sys/dev/scc/scc_bfe_macio.c
@@ -80,9 +80,8 @@ static device_method_t scc_macio_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_macio_driver = {
diff --git a/sys/dev/scc/scc_bfe_quicc.c b/sys/dev/scc/scc_bfe_quicc.c
index f92aa52..c7e97f3 100644
--- a/sys/dev/scc/scc_bfe_quicc.c
+++ b/sys/dev/scc/scc_bfe_quicc.c
@@ -88,9 +88,8 @@ static device_method_t scc_quicc_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_quicc_driver = {
diff --git a/sys/dev/scc/scc_bfe_sbus.c b/sys/dev/scc/scc_bfe_sbus.c
index 8eb963f..ba6b25a 100644
--- a/sys/dev/scc/scc_bfe_sbus.c
+++ b/sys/dev/scc/scc_bfe_sbus.c
@@ -80,9 +80,8 @@ static device_method_t scc_sbus_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_sbus_driver = {