From 4d7bb3e81a5dfb71f05d8dc1e9faa4d0bd112e1b Mon Sep 17 00:00:00 2001 From: sbz Date: Wed, 30 Jan 2013 18:01:20 +0000 Subject: Use DEVMETHOD_END macro defined in sys/bus.h instead of {0, 0} sentinel on device_method_t arrays Reviewed by: cognet Approved by: cognet --- sys/dev/usb/controller/usb_controller.c | 3 ++- sys/dev/usb/input/uhid.c | 3 ++- sys/dev/usb/input/ukbd.c | 3 ++- sys/dev/usb/input/ums.c | 3 ++- sys/dev/usb/misc/udbp.c | 3 ++- sys/dev/usb/misc/ufm.c | 3 ++- sys/dev/usb/net/if_cdce.c | 2 +- sys/dev/usb/net/if_cue.c | 2 +- sys/dev/usb/net/if_ipheth.c | 2 +- sys/dev/usb/net/if_kue.c | 2 +- sys/dev/usb/net/if_smsc.c | 2 +- sys/dev/usb/storage/umass.c | 3 ++- sys/dev/usb/storage/urio.c | 3 ++- sys/dev/usb/storage/ustorage_fs.c | 2 +- sys/dev/usb/usb_compat_linux.c | 2 +- 15 files changed, 23 insertions(+), 15 deletions(-) (limited to 'sys/dev/usb') diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index 9e00ef5..204569f 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -114,7 +114,8 @@ static device_method_t usb_methods[] = { DEVMETHOD(device_suspend, usb_suspend), DEVMETHOD(device_resume, usb_resume), DEVMETHOD(device_shutdown, usb_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t usb_driver = { diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 333d437..48d9c4f 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -852,7 +852,8 @@ static device_method_t uhid_methods[] = { DEVMETHOD(device_probe, uhid_probe), DEVMETHOD(device_attach, uhid_attach), DEVMETHOD(device_detach, uhid_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t uhid_driver = { diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c index 7a3e955..0c56ce0 100644 --- a/sys/dev/usb/input/ukbd.c +++ b/sys/dev/usb/input/ukbd.c @@ -2120,7 +2120,8 @@ static device_method_t ukbd_methods[] = { DEVMETHOD(device_attach, ukbd_attach), DEVMETHOD(device_detach, ukbd_detach), DEVMETHOD(device_resume, ukbd_resume), - {0, 0} + + DEVMETHOD_END }; static driver_t ukbd_driver = { diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c index 52e1b53..cc52b99 100644 --- a/sys/dev/usb/input/ums.c +++ b/sys/dev/usb/input/ums.c @@ -1039,7 +1039,8 @@ static device_method_t ums_methods[] = { DEVMETHOD(device_probe, ums_probe), DEVMETHOD(device_attach, ums_attach), DEVMETHOD(device_detach, ums_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t ums_driver = { diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c index 56f86ae..8b949ef 100644 --- a/sys/dev/usb/misc/udbp.c +++ b/sys/dev/usb/misc/udbp.c @@ -248,7 +248,8 @@ static device_method_t udbp_methods[] = { DEVMETHOD(device_probe, udbp_probe), DEVMETHOD(device_attach, udbp_attach), DEVMETHOD(device_detach, udbp_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t udbp_driver = { diff --git a/sys/dev/usb/misc/ufm.c b/sys/dev/usb/misc/ufm.c index 032b635..0612dd2 100644 --- a/sys/dev/usb/misc/ufm.c +++ b/sys/dev/usb/misc/ufm.c @@ -105,7 +105,8 @@ static device_method_t ufm_methods[] = { DEVMETHOD(device_probe, ufm_probe), DEVMETHOD(device_attach, ufm_attach), DEVMETHOD(device_detach, ufm_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t ufm_driver = { diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index e214fe2..6649bc0 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -237,7 +237,7 @@ static device_method_t cdce_methods[] = { DEVMETHOD(device_suspend, cdce_suspend), DEVMETHOD(device_resume, cdce_resume), - {0, 0} + DEVMETHOD_END }; static driver_t cdce_driver = { diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c index 30c5247a..6414e7a 100644 --- a/sys/dev/usb/net/if_cue.c +++ b/sys/dev/usb/net/if_cue.c @@ -157,7 +157,7 @@ static device_method_t cue_methods[] = { DEVMETHOD(device_attach, cue_attach), DEVMETHOD(device_detach, cue_detach), - {0, 0} + DEVMETHOD_END }; static driver_t cue_driver = { diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c index 28f941c..3eb2582 100644 --- a/sys/dev/usb/net/if_ipheth.c +++ b/sys/dev/usb/net/if_ipheth.c @@ -116,7 +116,7 @@ static device_method_t ipheth_methods[] = { DEVMETHOD(device_attach, ipheth_attach), DEVMETHOD(device_detach, ipheth_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ipheth_driver = { diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c index 791c73a..ec0c5f0 100644 --- a/sys/dev/usb/net/if_kue.c +++ b/sys/dev/usb/net/if_kue.c @@ -199,7 +199,7 @@ static device_method_t kue_methods[] = { DEVMETHOD(device_attach, kue_attach), DEVMETHOD(device_detach, kue_detach), - {0, 0} + DEVMETHOD_END }; static driver_t kue_driver = { diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 5ce45bc..95af5eb 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1810,7 +1810,7 @@ static device_method_t smsc_methods[] = { DEVMETHOD(miibus_writereg, smsc_miibus_writereg), DEVMETHOD(miibus_statchg, smsc_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t smsc_driver = { diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index a7feea7..e2ff0ef 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -698,7 +698,8 @@ static device_method_t umass_methods[] = { DEVMETHOD(device_probe, umass_probe), DEVMETHOD(device_attach, umass_attach), DEVMETHOD(device_detach, umass_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t umass_driver = { diff --git a/sys/dev/usb/storage/urio.c b/sys/dev/usb/storage/urio.c index 39fcbe9..6cbb596 100644 --- a/sys/dev/usb/storage/urio.c +++ b/sys/dev/usb/storage/urio.c @@ -185,7 +185,8 @@ static device_method_t urio_methods[] = { DEVMETHOD(device_probe, urio_probe), DEVMETHOD(device_attach, urio_attach), DEVMETHOD(device_detach, urio_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t urio_driver = { diff --git a/sys/dev/usb/storage/ustorage_fs.c b/sys/dev/usb/storage/ustorage_fs.c index b2cda10..15a5ba9 100644 --- a/sys/dev/usb/storage/ustorage_fs.c +++ b/sys/dev/usb/storage/ustorage_fs.c @@ -256,7 +256,7 @@ static device_method_t ustorage_fs_methods[] = { DEVMETHOD(device_suspend, ustorage_fs_suspend), DEVMETHOD(device_resume, ustorage_fs_resume), - {0, 0} + DEVMETHOD_END }; static driver_t ustorage_fs_driver = { diff --git a/sys/dev/usb/usb_compat_linux.c b/sys/dev/usb/usb_compat_linux.c index 637ac18..a42f636 100644 --- a/sys/dev/usb/usb_compat_linux.c +++ b/sys/dev/usb/usb_compat_linux.c @@ -113,7 +113,7 @@ static device_method_t usb_linux_methods[] = { DEVMETHOD(device_suspend, usb_linux_suspend), DEVMETHOD(device_resume, usb_linux_resume), - {0, 0} + DEVMETHOD_END }; static driver_t usb_linux_driver = { -- cgit v1.1