From 15f415f64a16ab1188ebab11ae259fe70080fb05 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 12 Oct 2012 18:59:04 +0200 Subject: [PATCH] usb4bsd: Use NULL for pointers. --- sys/bus/u4b/audio/uaudio.c | 2 +- sys/bus/u4b/audio/uaudio_pcm.c | 2 +- sys/bus/u4b/controller/ehci_pci.c | 2 +- sys/bus/u4b/controller/ohci_pci.c | 2 +- sys/bus/u4b/controller/uhci_pci.c | 2 +- sys/bus/u4b/controller/usb_controller.c | 8 ++++---- sys/bus/u4b/controller/xhci_pci.c | 2 +- sys/bus/u4b/input/uhid.c | 2 +- sys/bus/u4b/input/ukbd.c | 2 +- sys/bus/u4b/input/ums.c | 2 +- sys/bus/u4b/net/if_axe.c | 4 ++-- sys/bus/u4b/net/if_udav.c | 4 ++-- sys/bus/u4b/storage/umass.c | 2 +- sys/bus/u4b/storage/ustorage_fs.c | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/bus/u4b/audio/uaudio.c b/sys/bus/u4b/audio/uaudio.c index 99551a190f..3b93c79189 100644 --- a/sys/bus/u4b/audio/uaudio.c +++ b/sys/bus/u4b/audio/uaudio.c @@ -3887,7 +3887,7 @@ umidi_detach(device_t dev) return (0); } -DRIVER_MODULE(uaudio, uhub, uaudio_driver, uaudio_devclass, NULL, 0); +DRIVER_MODULE(uaudio, uhub, uaudio_driver, uaudio_devclass, NULL, NULL); MODULE_DEPEND(uaudio, usb, 1, 1, 1); MODULE_DEPEND(uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(uaudio, 1); diff --git a/sys/bus/u4b/audio/uaudio_pcm.c b/sys/bus/u4b/audio/uaudio_pcm.c index adb0a30cee..068efb610a 100644 --- a/sys/bus/u4b/audio/uaudio_pcm.c +++ b/sys/bus/u4b/audio/uaudio_pcm.c @@ -240,7 +240,7 @@ static driver_t ua_pcm_driver = { PCM_SOFTC_SIZE, }; -DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, pcm_devclass, 0, 0); +DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, pcm_devclass, NULL, NULL); MODULE_DEPEND(ua_pcm, uaudio, 1, 1, 1); MODULE_DEPEND(ua_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(ua_pcm, 1); diff --git a/sys/bus/u4b/controller/ehci_pci.c b/sys/bus/u4b/controller/ehci_pci.c index fc85158a8f..218ed7d134 100644 --- a/sys/bus/u4b/controller/ehci_pci.c +++ b/sys/bus/u4b/controller/ehci_pci.c @@ -547,5 +547,5 @@ static driver_t ehci_driver = { static devclass_t ehci_devclass; -DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0); +DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, NULL, NULL); MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/bus/u4b/controller/ohci_pci.c b/sys/bus/u4b/controller/ohci_pci.c index 938d150983..8662fdd23a 100644 --- a/sys/bus/u4b/controller/ohci_pci.c +++ b/sys/bus/u4b/controller/ohci_pci.c @@ -376,5 +376,5 @@ static driver_t ohci_driver = { static devclass_t ohci_devclass; -DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0); +DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, NULL, NULL); MODULE_DEPEND(ohci, usb, 1, 1, 1); diff --git a/sys/bus/u4b/controller/uhci_pci.c b/sys/bus/u4b/controller/uhci_pci.c index d65c67fbe0..022249a56a 100644 --- a/sys/bus/u4b/controller/uhci_pci.c +++ b/sys/bus/u4b/controller/uhci_pci.c @@ -439,5 +439,5 @@ static driver_t uhci_driver = { static devclass_t uhci_devclass; -DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0); +DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, NULL, NULL); MODULE_DEPEND(uhci, usb, 1, 1, 1); diff --git a/sys/bus/u4b/controller/usb_controller.c b/sys/bus/u4b/controller/usb_controller.c index a142f2f4eb..8b0e92e3dc 100644 --- a/sys/bus/u4b/controller/usb_controller.c +++ b/sys/bus/u4b/controller/usb_controller.c @@ -111,10 +111,10 @@ static driver_t usb_driver = { }; /* Host Only Drivers */ -DRIVER_MODULE(usbus, ohci, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, uhci, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, ehci, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, xhci, usb_driver, usb_devclass, 0, 0); +DRIVER_MODULE(usbus, ohci, usb_driver, usb_devclass, NULL, NULL); +DRIVER_MODULE(usbus, uhci, usb_driver, usb_devclass, NULL, NULL); +DRIVER_MODULE(usbus, ehci, usb_driver, usb_devclass, NULL, NULL); +DRIVER_MODULE(usbus, xhci, usb_driver, usb_devclass, NULL, NULL); /*------------------------------------------------------------------------* * usb_probe diff --git a/sys/bus/u4b/controller/xhci_pci.c b/sys/bus/u4b/controller/xhci_pci.c index e36c2e9f9b..15d105827e 100644 --- a/sys/bus/u4b/controller/xhci_pci.c +++ b/sys/bus/u4b/controller/xhci_pci.c @@ -81,7 +81,7 @@ static driver_t xhci_driver = { static devclass_t xhci_devclass; -DRIVER_MODULE(xhci, pci, xhci_driver, xhci_devclass, 0, 0); +DRIVER_MODULE(xhci, pci, xhci_driver, xhci_devclass, NULL, NULL); MODULE_DEPEND(xhci, usb, 1, 1, 1); diff --git a/sys/bus/u4b/input/uhid.c b/sys/bus/u4b/input/uhid.c index e2d9459b1e..ce840228ab 100644 --- a/sys/bus/u4b/input/uhid.c +++ b/sys/bus/u4b/input/uhid.c @@ -808,6 +808,6 @@ static driver_t uhid_driver = { .size = sizeof(struct uhid_softc), }; -DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0); +DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, NULL); MODULE_DEPEND(uhid, usb, 1, 1, 1); MODULE_VERSION(uhid, 1); diff --git a/sys/bus/u4b/input/ukbd.c b/sys/bus/u4b/input/ukbd.c index d602dbc6c0..95d2e7d79e 100644 --- a/sys/bus/u4b/input/ukbd.c +++ b/sys/bus/u4b/input/ukbd.c @@ -2135,6 +2135,6 @@ static driver_t ukbd_driver = { .size = sizeof(struct ukbd_softc), }; -DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); +DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, NULL); MODULE_DEPEND(ukbd, usb, 1, 1, 1); MODULE_VERSION(ukbd, 1); diff --git a/sys/bus/u4b/input/ums.c b/sys/bus/u4b/input/ums.c index 276c219ccc..a1db6c81eb 100644 --- a/sys/bus/u4b/input/ums.c +++ b/sys/bus/u4b/input/ums.c @@ -1060,6 +1060,6 @@ static driver_t ums_driver = { .size = sizeof(struct ums_softc), }; -DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0); +DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, NULL); MODULE_DEPEND(ums, usb, 1, 1, 1); MODULE_VERSION(ums, 1); diff --git a/sys/bus/u4b/net/if_axe.c b/sys/bus/u4b/net/if_axe.c index b72921b438..b36a300290 100644 --- a/sys/bus/u4b/net/if_axe.c +++ b/sys/bus/u4b/net/if_axe.c @@ -269,8 +269,8 @@ static driver_t axe_driver = { static devclass_t axe_devclass; -DRIVER_MODULE(axe, uhub, axe_driver, axe_devclass, NULL, 0); -DRIVER_MODULE(miibus, axe, miibus_driver, miibus_devclass, 0, 0); +DRIVER_MODULE(axe, uhub, axe_driver, axe_devclass, NULL, NULL); +DRIVER_MODULE(miibus, axe, miibus_driver, miibus_devclass, NULL, NULL); MODULE_DEPEND(axe, uether, 1, 1, 1); MODULE_DEPEND(axe, usb, 1, 1, 1); MODULE_DEPEND(axe, ether, 1, 1, 1); diff --git a/sys/bus/u4b/net/if_udav.c b/sys/bus/u4b/net/if_udav.c index 81fd470006..188945ceb6 100644 --- a/sys/bus/u4b/net/if_udav.c +++ b/sys/bus/u4b/net/if_udav.c @@ -158,8 +158,8 @@ static driver_t udav_driver = { static devclass_t udav_devclass; -DRIVER_MODULE(udav, uhub, udav_driver, udav_devclass, NULL, 0); -DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, 0, 0); +DRIVER_MODULE(udav, uhub, udav_driver, udav_devclass, NULL, NULL); +DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, NULL, NULL); MODULE_DEPEND(udav, uether, 1, 1, 1); MODULE_DEPEND(udav, usb, 1, 1, 1); MODULE_DEPEND(udav, ether, 1, 1, 1); diff --git a/sys/bus/u4b/storage/umass.c b/sys/bus/u4b/storage/umass.c index 6ab94ceb81..deb09c4e22 100644 --- a/sys/bus/u4b/storage/umass.c +++ b/sys/bus/u4b/storage/umass.c @@ -709,7 +709,7 @@ static driver_t umass_driver = { .size = sizeof(struct umass_softc), }; -DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, NULL, 0); +DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, NULL, NULL); MODULE_DEPEND(umass, usb, 1, 1, 1); MODULE_DEPEND(umass, cam, 1, 1, 1); MODULE_VERSION(umass, 1); diff --git a/sys/bus/u4b/storage/ustorage_fs.c b/sys/bus/u4b/storage/ustorage_fs.c index ac8265ce02..0df2097759 100644 --- a/sys/bus/u4b/storage/ustorage_fs.c +++ b/sys/bus/u4b/storage/ustorage_fs.c @@ -262,7 +262,7 @@ static driver_t ustorage_fs_driver = { static devclass_t ustorage_fs_devclass; -DRIVER_MODULE(ustorage_fs, uhub, ustorage_fs_driver, ustorage_fs_devclass, NULL, 0); +DRIVER_MODULE(ustorage_fs, uhub, ustorage_fs_driver, ustorage_fs_devclass, NULL, NULL); MODULE_VERSION(ustorage_fs, 0); MODULE_DEPEND(ustorage_fs, usb, 1, 1, 1); -- 2.41.0