From 17975de10935ff2c43fe8eb641c048974acb07c0 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 8 Dec 2018 10:39:12 +0100 Subject: [PATCH] kernel: Use NULL for pointers in DRIVER_MODULE(). --- sys/dev/acpica/acpi_button.c | 2 +- sys/dev/acpica/acpi_sony/acpi_sony.c | 2 +- sys/dev/misc/psm/psm.c | 2 +- sys/dev/netif/bwn/bwn/if_bwn.c | 2 +- sys/dev/netif/ndis/if_ndis_pci.c | 3 ++- sys/dev/netif/re/re.c | 2 +- sys/dev/raid/mpr/mpr_pci.c | 2 +- sys/dev/sound/pci/emu10kx-midi.c | 3 ++- sys/dev/virtual/amazon/ena/ena.c | 2 +- sys/dev/virtual/virtio/balloon/virtio_balloon.c | 2 +- sys/dev/virtual/virtio/random/virtio_random.c | 2 +- sys/dev/virtual/vmware/vmxnet3/if_vmx.c | 2 +- sys/gnu/dev/misc/apple_gmux/apple-gmux.c | 2 +- 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c index 3f46a9b5dd..579e7b7054 100644 --- a/sys/dev/acpica/acpi_button.c +++ b/sys/dev/acpica/acpi_button.c @@ -91,7 +91,7 @@ static driver_t acpi_button_driver = { static devclass_t acpi_button_devclass; DRIVER_MODULE(acpi_button, acpi, acpi_button_driver, acpi_button_devclass, - 0, 0); + NULL, NULL); MODULE_DEPEND(acpi_button, acpi, 1, 1, 1); static int diff --git a/sys/dev/acpica/acpi_sony/acpi_sony.c b/sys/dev/acpica/acpi_sony/acpi_sony.c index fef5f64acc..491fa91eae 100644 --- a/sys/dev/acpica/acpi_sony/acpi_sony.c +++ b/sys/dev/acpica/acpi_sony/acpi_sony.c @@ -108,7 +108,7 @@ static driver_t acpi_sony_driver = { static devclass_t acpi_sony_devclass; DRIVER_MODULE(acpi_sony, acpi, acpi_sony_driver, acpi_sony_devclass, - 0, 0); + NULL, NULL); MODULE_DEPEND(acpi_sony, acpi, 1, 1, 1); static char *sny_id[] = {"SNY5001", NULL}; diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index 04ceb2760c..84122802a1 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -6391,7 +6391,7 @@ psmresume(device_t dev) return (err); } -DRIVER_MODULE(psm, atkbdc, psm_driver, psm_devclass, 0, 0); +DRIVER_MODULE(psm, atkbdc, psm_driver, psm_devclass, NULL, NULL); #ifdef DEV_ISA #if 0 diff --git a/sys/dev/netif/bwn/bwn/if_bwn.c b/sys/dev/netif/bwn/bwn/if_bwn.c index b48ff6650f..b3f5bfdfaf 100644 --- a/sys/dev/netif/bwn/bwn/if_bwn.c +++ b/sys/dev/netif/bwn/bwn/if_bwn.c @@ -7478,7 +7478,7 @@ static driver_t bwn_driver = { sizeof(struct bwn_softc) }; static devclass_t bwn_devclass; -DRIVER_MODULE(bwn, siba_bwn, bwn_driver, bwn_devclass, 0, 0); +DRIVER_MODULE(bwn, siba_bwn, bwn_driver, bwn_devclass, NULL, NULL); MODULE_DEPEND(bwn, siba_bwn, 1, 1, 1); MODULE_DEPEND(bwn, wlan, 1, 1, 1); /* 802.11 media layer */ MODULE_DEPEND(bwn, firmware, 1, 1, 1); /* firmware support */ diff --git a/sys/dev/netif/ndis/if_ndis_pci.c b/sys/dev/netif/ndis/if_ndis_pci.c index 12bd734b8c..2e15a5f3a8 100644 --- a/sys/dev/netif/ndis/if_ndis_pci.c +++ b/sys/dev/netif/ndis/if_ndis_pci.c @@ -127,7 +127,8 @@ static driver_t ndis_driver = { static devclass_t ndis_devclass; -DRIVER_MODULE(if_ndis, pci, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); +DRIVER_MODULE(if_ndis, pci, ndis_driver, ndis_devclass, ndisdrv_modevent, + NULL); static int ndis_devcompare(interface_type bustype, struct ndis_pci_type *t, device_t dev) diff --git a/sys/dev/netif/re/re.c b/sys/dev/netif/re/re.c index 6df43a57d4..234f618c8a 100644 --- a/sys/dev/netif/re/re.c +++ b/sys/dev/netif/re/re.c @@ -336,7 +336,7 @@ static driver_t re_driver = { static devclass_t re_devclass; -DRIVER_MODULE(if_re, pci, re_driver, re_devclass, 0, 0); +DRIVER_MODULE(if_re, pci, re_driver, re_devclass, NULL, NULL); #endif /* !__DragonFly__ */ static int re_is_ups_resume(struct re_softc *sc) diff --git a/sys/dev/raid/mpr/mpr_pci.c b/sys/dev/raid/mpr/mpr_pci.c index afb5ce466e..d8a28a9fe7 100644 --- a/sys/dev/raid/mpr/mpr_pci.c +++ b/sys/dev/raid/mpr/mpr_pci.c @@ -85,7 +85,7 @@ static driver_t mpr_pci_driver = { }; static devclass_t mpr_devclass; -DRIVER_MODULE(mpr, pci, mpr_pci_driver, mpr_devclass, 0, 0); +DRIVER_MODULE(mpr, pci, mpr_pci_driver, mpr_devclass, NULL, NULL); MODULE_DEPEND(mpr, cam, 1, 1, 1); struct mpr_ident { diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c index feb8f2375a..a305c795d9 100644 --- a/sys/dev/sound/pci/emu10kx-midi.c +++ b/sys/dev/sound/pci/emu10kx-midi.c @@ -245,7 +245,8 @@ static driver_t emu_midi_driver = { emu_midi_methods, sizeof(struct emu_midi_softc), }; -DRIVER_MODULE(snd_emu10kx_midi, emu10kx, emu_midi_driver, emu_midi_devclass, 0, 0); +DRIVER_MODULE(snd_emu10kx_midi, emu10kx, emu_midi_driver, emu_midi_devclass, + NULL, NULL); MODULE_DEPEND(snd_emu10kx_midi, snd_emu10kx, SND_EMU10KX_MINVER, SND_EMU10KX_PREFVER, SND_EMU10KX_MAXVER); MODULE_DEPEND(snd_emu10kx_midi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_emu10kx_midi, SND_EMU10KX_PREFVER); diff --git a/sys/dev/virtual/amazon/ena/ena.c b/sys/dev/virtual/amazon/ena/ena.c index 392e9f3f69..41f15b90b2 100644 --- a/sys/dev/virtual/amazon/ena/ena.c +++ b/sys/dev/virtual/amazon/ena/ena.c @@ -3960,7 +3960,7 @@ static driver_t ena_driver = { }; devclass_t ena_devclass; -DRIVER_MODULE(ena, pci, ena_driver, ena_devclass, 0, 0); +DRIVER_MODULE(ena, pci, ena_driver, ena_devclass, NULL, NULL); MODULE_DEPEND(ena, pci, 1, 1, 1); MODULE_DEPEND(ena, ether, 1, 1, 1); diff --git a/sys/dev/virtual/virtio/balloon/virtio_balloon.c b/sys/dev/virtual/virtio/balloon/virtio_balloon.c index 8d5759d25a..e364e94024 100644 --- a/sys/dev/virtual/virtio/balloon/virtio_balloon.c +++ b/sys/dev/virtual/virtio/balloon/virtio_balloon.c @@ -218,7 +218,7 @@ static driver_t vtballoon_driver = { static devclass_t vtballoon_devclass; DRIVER_MODULE(virtio_balloon, virtio_pci, vtballoon_driver, - vtballoon_devclass, 0, 0); + vtballoon_devclass, NULL, NULL); MODULE_VERSION(virtio_balloon, 1); MODULE_DEPEND(virtio_balloon, virtio, 1, 1, 1); diff --git a/sys/dev/virtual/virtio/random/virtio_random.c b/sys/dev/virtual/virtio/random/virtio_random.c index 5d14265cdd..32b2a665dc 100644 --- a/sys/dev/virtual/virtio/random/virtio_random.c +++ b/sys/dev/virtual/virtio/random/virtio_random.c @@ -84,7 +84,7 @@ static driver_t vtrnd_driver = { static devclass_t vtrnd_devclass; DRIVER_MODULE(virtio_random, virtio_pci, vtrnd_driver, vtrnd_devclass, - vtrnd_modevent, 0); + vtrnd_modevent, NULL); MODULE_VERSION(virtio_random, 1); MODULE_DEPEND(virtio_random, virtio, 1, 1, 1); diff --git a/sys/dev/virtual/vmware/vmxnet3/if_vmx.c b/sys/dev/virtual/vmware/vmxnet3/if_vmx.c index 01bb832d4a..649739808e 100644 --- a/sys/dev/virtual/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/virtual/vmware/vmxnet3/if_vmx.c @@ -276,7 +276,7 @@ static driver_t vmxnet3_driver = { }; static devclass_t vmxnet3_devclass; -DRIVER_MODULE(vmx, pci, vmxnet3_driver, vmxnet3_devclass, 0, 0); +DRIVER_MODULE(vmx, pci, vmxnet3_driver, vmxnet3_devclass, NULL, NULL); MODULE_DEPEND(vmx, pci, 1, 1, 1); MODULE_DEPEND(vmx, ether, 1, 1, 1); diff --git a/sys/gnu/dev/misc/apple_gmux/apple-gmux.c b/sys/gnu/dev/misc/apple_gmux/apple-gmux.c index 4e4ad68ddf..844264f1e6 100644 --- a/sys/gnu/dev/misc/apple_gmux/apple-gmux.c +++ b/sys/gnu/dev/misc/apple_gmux/apple-gmux.c @@ -948,7 +948,7 @@ static driver_t apple_gmux_driver = { sizeof(struct apple_gmux_softc) }; -DRIVER_MODULE(gmux, acpi, apple_gmux_driver, gmux_devclass, 0, 0); +DRIVER_MODULE(gmux, acpi, apple_gmux_driver, gmux_devclass, NULL, NULL); MODULE_VERSION(apple_gmux, 1); MODULE_DEPEND(apple_gmux, drm, 1, 1, 2); MODULE_DEPEND(apple_gmux, vga_switcheroo, 1, 1, 2); -- 2.11.4.GIT