- 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, 4 insertions, 14 deletions

diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c
index 7b8845f..a25ebe3 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.c
+++ b/sys/mips/rmi/dev/nlge/if_nlge.c
@@ -257,10 +257,8 @@ static device_method_t nlna_methods[] = {
 
 	/* bus interface : TBD : what are these for ? */
 	DEVMETHOD(bus_setup_intr,       bus_generic_setup_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t	nlna_driver = {
diff --git a/sys/mips/rmi/dev/sec/rmisec.c b/sys/mips/rmi/dev/sec/rmisec.c
index 5e00307..6501f75 100644
--- a/sys/mips/rmi/dev/sec/rmisec.c
+++ b/sys/mips/rmi/dev/sec/rmisec.c
@@ -76,16 +76,12 @@ static device_method_t xlr_sec_methods[] = {
 	DEVMETHOD(device_attach, xlr_sec_attach),
 	DEVMETHOD(device_detach, xlr_sec_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-	DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
 	/* crypto device methods */
 	DEVMETHOD(cryptodev_newsession, xlr_sec_newsession),
 	DEVMETHOD(cryptodev_freesession,xlr_sec_freesession),
 	DEVMETHOD(cryptodev_process,    xlr_sec_process),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t xlr_sec_driver = {
diff --git a/sys/mips/rmi/xlr_pci.c b/sys/mips/rmi/xlr_pci.c
index 29db1b6..feea696 100644
--- a/sys/mips/rmi/xlr_pci.c
+++ b/sys/mips/rmi/xlr_pci.c
@@ -627,7 +627,6 @@ static device_method_t xlr_pcib_methods[] = {
 	DEVMETHOD(device_attach, xlr_pcib_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar, xlr_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar, xlr_pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource, xlr_pci_alloc_resource),
@@ -648,7 +647,7 @@ static device_method_t xlr_pcib_methods[] = {
 	DEVMETHOD(pcib_release_msi, xlr_release_msi),
 	DEVMETHOD(pcib_map_msi, xlr_map_msi),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t xlr_pcib_driver = {
diff --git a/sys/mips/rmi/xls_ehci.c b/sys/mips/rmi/xls_ehci.c
index 5c7a536..b0360f3 100644
--- a/sys/mips/rmi/xls_ehci.c
+++ b/sys/mips/rmi/xls_ehci.c
@@ -252,10 +252,7 @@ static device_method_t ehci_methods[] = {
 	DEVMETHOD(device_resume, ehci_xls_resume),
 	DEVMETHOD(device_shutdown, ehci_xls_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ehci_driver = {