git: 49c1b388d5a8 - main - rtw88: harmonize all MODULE_DEPEND to rtw88

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Tue, 10 Feb 2026 10:16:53 UTC
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=49c1b388d5a89761980d24aee14f3bd0db7c0dda

commit 49c1b388d5a89761980d24aee14f3bd0db7c0dda
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2026-01-26 16:18:49 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-02-10 10:16:33 +0000

    rtw88: harmonize all MODULE_DEPEND to rtw88
    
    From the time I used to split up the driver into a core part and
    bus attachment sub-drivers the various bus attachments had their own
    module name but all is "rtw88" now.
    
    Core functionality depends on linuxkpi, linuxkpi_wlan, and for debug.c
    lindebugfs.
    Each bus attachment then depends on its own parent layer if needed:
    PCI gets pull in through linuxkpi, USB: depends on [the future] linuxkpi_usb,
    and SDIO: depends on [the future] linuxkpi_sdio.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
    Differential Revision: https://reviews.freebsd.org/D55021
---
 sys/contrib/dev/rtw88/debug.c | 4 ++++
 sys/contrib/dev/rtw88/main.c  | 5 +++++
 sys/contrib/dev/rtw88/pci.c   | 8 --------
 sys/contrib/dev/rtw88/usb.c   | 5 +----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c
index 53742a3220f2..1e2b11cf1dd3 100644
--- a/sys/contrib/dev/rtw88/debug.c
+++ b/sys/contrib/dev/rtw88/debug.c
@@ -1381,3 +1381,7 @@ void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask,
 EXPORT_SYMBOL(rtw_dbg);
 
 #endif /* CONFIG_RTW88_DEBUG */
+
+#ifdef CONFIG_RTW88_DEBUGFS
+MODULE_DEPEND(rtw88, lindebugfs, 1, 1, 1);
+#endif
diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c
index d9e6e9477dfb..b38709b180fd 100644
--- a/sys/contrib/dev/rtw88/main.c
+++ b/sys/contrib/dev/rtw88/main.c
@@ -2591,3 +2591,8 @@ void rtw_set_ampdu_factor(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
 MODULE_AUTHOR("Realtek Corporation");
 MODULE_DESCRIPTION("Realtek 802.11ac wireless core module");
 MODULE_LICENSE("Dual BSD/GPL");
+#if defined(__FreeBSD__)
+MODULE_VERSION(rtw88, 1);
+MODULE_DEPEND(rtw88, linuxkpi, 1, 1, 1);
+MODULE_DEPEND(rtw88, linuxkpi_wlan, 1, 1, 1);
+#endif
diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c
index e4cbaae4646f..1dc4f5915d2d 100644
--- a/sys/contrib/dev/rtw88/pci.c
+++ b/sys/contrib/dev/rtw88/pci.c
@@ -1964,11 +1964,3 @@ EXPORT_SYMBOL(rtw_pci_shutdown);
 MODULE_AUTHOR("Realtek Corporation");
 MODULE_DESCRIPTION("Realtek PCI 802.11ac wireless driver");
 MODULE_LICENSE("Dual BSD/GPL");
-#if defined(__FreeBSD__)
-MODULE_VERSION(rtw_pci, 1);
-MODULE_DEPEND(rtw_pci, linuxkpi, 1, 1, 1);
-MODULE_DEPEND(rtw_pci, linuxkpi_wlan, 1, 1, 1);
-#ifdef CONFIG_RTW88_DEBUGFS
-MODULE_DEPEND(rtw_pci, lindebugfs, 1, 1, 1);
-#endif
-#endif
diff --git a/sys/contrib/dev/rtw88/usb.c b/sys/contrib/dev/rtw88/usb.c
index 9fe00af9fc0e..69a4cb60184f 100644
--- a/sys/contrib/dev/rtw88/usb.c
+++ b/sys/contrib/dev/rtw88/usb.c
@@ -1379,8 +1379,5 @@ MODULE_AUTHOR("Realtek Corporation");
 MODULE_DESCRIPTION("Realtek USB 802.11ac wireless driver");
 MODULE_LICENSE("Dual BSD/GPL");
 #if defined(__FreeBSD__)
-MODULE_VERSION(rtw88_usb, 1);
-MODULE_DEPEND(rtw88_usb, rtw88_core, 1, 1, 1);
-MODULE_DEPEND(rtw88_usb, linuxkpi, 1, 1, 1);
-MODULE_DEPEND(rtw88_usb, linuxkpi_wlan, 1, 1, 1);
+MODULE_DEPEND(rtw88, linuxkpi_usb, 1, 1, 1);
 #endif