wifi: rtw88: Fix the module names printed in dmesg

The rtw88 module names all start with the "rtw88_" prefix, but the
messages in dmesg mostly use the "rtw_" prefix. The messages from
rtw88_8723cs don't even have the underscore.

Use the KBUILD_MODNAME macro in every driver. This ensures that the
messages in dmesg will always use the module name.

Before:

Mar 17 15:54:19 ideapad2 kernel: rtw_8814au 2-4:1.0: Firmware version 33.6.0, H2C version 6

After:

Mar 17 16:33:35 ideapad2 kernel: rtw88_8814au 2-4:1.0: Firmware version 33.6.0, H2C version 6

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/29cd29ba-bc51-4d5b-ad48-a43c6ce72d56@gmail.com

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723cs.c b/drivers/net/wireless/realtek/rtw88/rtw8723cs.c
index 8d38d36be8c05c712ae207015e0cd7206c33d453..1f98d35a8dd11f1e8be9b363aa80506475016f03 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723cs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723cs.c
@@ -19,7 +19,7 @@ static const struct sdio_device_id rtw_8723cs_id_table[] = {
 MODULE_DEVICE_TABLE(sdio, rtw_8723cs_id_table);
 
 static struct sdio_driver rtw_8723cs_driver = {
-       .name = "rtw8723cs",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8723cs_id_table,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723de.c b/drivers/net/wireless/realtek/rtw88/rtw8723de.c
index abbaafa32851332da1f1308cfbe8f03d5b39608e..87c8bc9d18a97c1bca417dddaf9b63fb26bfa3a5 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723de.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723de.c
@@ -17,7 +17,7 @@ static const struct pci_device_id rtw_8723de_id_table[] = {
 MODULE_DEVICE_TABLE(pci, rtw_8723de_id_table);
 
 static struct pci_driver rtw_8723de_driver = {
-       .name = "rtw_8723de",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8723de_id_table,
        .probe = rtw_pci_probe,
        .remove = rtw_pci_remove,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
index e5b6960ba0a02c3370511514e4d36ebe8de76ae9..206b77e5b98e47ff335c186bf249202ba29c1e18 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
@@ -25,7 +25,7 @@ static const struct sdio_device_id rtw_8723ds_id_table[] =  {
 MODULE_DEVICE_TABLE(sdio, rtw_8723ds_id_table);
 
 static struct sdio_driver rtw_8723ds_driver = {
-       .name = "rtw_8723ds",
+       .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
        .id_table = rtw_8723ds_id_table,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723du.c b/drivers/net/wireless/realtek/rtw88/rtw8723du.c
index 322a805da76b08a436b404a1cf9cbbc900f9f1c3..b661a26e0e2238fb62d873ae1eeb1ad6e8cc4aa0 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723du.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723du.c
@@ -24,7 +24,7 @@ static int rtw8723du_probe(struct usb_interface *intf,
 }
 
 static struct usb_driver rtw_8723du_driver = {
-       .name = "rtw_8723du",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8723du_id_table,
        .probe = rtw8723du_probe,
        .disconnect = rtw_usb_disconnect,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8812au.c b/drivers/net/wireless/realtek/rtw88/rtw8812au.c
index e18995f4cc78e9d0b96709c972dae2fa7180ef59..dfea896703720579f7e9fa2482fb88e145ee112c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8812au.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8812au.c
@@ -82,7 +82,7 @@ static const struct usb_device_id rtw_8812au_id_table[] = {
 MODULE_DEVICE_TABLE(usb, rtw_8812au_id_table);
 
 static struct usb_driver rtw_8812au_driver = {
-       .name = "rtw_8812au",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8812au_id_table,
        .probe = rtw_usb_probe,
        .disconnect = rtw_usb_disconnect,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8814ae.c b/drivers/net/wireless/realtek/rtw88/rtw8814ae.c
index 54d2e20a7764e43808d77e045f4e41b8d93a53f5..c7436f1c8d40fe9d8fc03080d9913db2cda92948 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8814ae.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8814ae.c
@@ -17,7 +17,7 @@ static const struct pci_device_id rtw_8814ae_id_table[] = {
 MODULE_DEVICE_TABLE(pci, rtw_8814ae_id_table);
 
 static struct pci_driver rtw_8814ae_driver = {
-       .name = "rtw_8814ae",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8814ae_id_table,
        .probe = rtw_pci_probe,
        .remove = rtw_pci_remove,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8814au.c b/drivers/net/wireless/realtek/rtw88/rtw8814au.c
index afe045fb84de1ae04d49c3c9f330ba5e52a74647..1a0886ec17dd8393f7f7a4f44b8eadcfff9705cb 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8814au.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8814au.c
@@ -42,7 +42,7 @@ static const struct usb_device_id rtw_8814au_id_table[] = {
 MODULE_DEVICE_TABLE(usb, rtw_8814au_id_table);
 
 static struct usb_driver rtw_8814au_driver = {
-       .name = "rtw_8814au",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8814au_id_table,
        .probe = rtw_usb_probe,
        .disconnect = rtw_usb_disconnect,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821au.c b/drivers/net/wireless/realtek/rtw88/rtw8821au.c
index a01744b64e8da93a788aa58aaec34de0a942c792..28c281b3297874901f800a37ef0cba5ef76d21a1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821au.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821au.c
@@ -66,7 +66,7 @@ static const struct usb_device_id rtw_8821au_id_table[] = {
 MODULE_DEVICE_TABLE(usb, rtw_8821au_id_table);
 
 static struct usb_driver rtw_8821au_driver = {
-       .name = "rtw_8821au",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8821au_id_table,
        .probe = rtw_usb_probe,
        .disconnect = rtw_usb_disconnect,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821ce.c b/drivers/net/wireless/realtek/rtw88/rtw8821ce.c
index f3d971feda047377281d422fec7d969e97a1a1e7..40637c079d9962212d5ba10c51eeb453528545bd 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821ce.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821ce.c
@@ -21,7 +21,7 @@ static const struct pci_device_id rtw_8821ce_id_table[] = {
 MODULE_DEVICE_TABLE(pci, rtw_8821ce_id_table);
 
 static struct pci_driver rtw_8821ce_driver = {
-       .name = "rtw_8821ce",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8821ce_id_table,
        .probe = rtw_pci_probe,
        .remove = rtw_pci_remove,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c
index a359413369a4fe88295c29459c2fa6eb0ee2ca7e..6d94162213c6bc230765ead60dc17a91cecfd2ca 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c
@@ -20,7 +20,7 @@ static const struct sdio_device_id rtw_8821cs_id_table[] =  {
 MODULE_DEVICE_TABLE(sdio, rtw_8821cs_id_table);
 
 static struct sdio_driver rtw_8821cs_driver = {
-       .name = "rtw_8821cs",
+       .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
        .id_table = rtw_8821cs_id_table,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c
index a019f4085e73893e205c0a4324241ce139bbc29d..7a0fffc359e255c59794114efcc8d84ed2c25b56 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c
@@ -48,7 +48,7 @@ static int rtw_8821cu_probe(struct usb_interface *intf,
 }
 
 static struct usb_driver rtw_8821cu_driver = {
-       .name = "rtw_8821cu",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8821cu_id_table,
        .probe = rtw_8821cu_probe,
        .disconnect = rtw_usb_disconnect,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822be.c b/drivers/net/wireless/realtek/rtw88/rtw8822be.c
index 4994950776cd9075460deac67e1696af2638a7b3..0bb9f70e79209bfcc139d2fd414a218267772806 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822be.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822be.c
@@ -17,7 +17,7 @@ static const struct pci_device_id rtw_8822be_id_table[] = {
 MODULE_DEVICE_TABLE(pci, rtw_8822be_id_table);
 
 static struct pci_driver rtw_8822be_driver = {
-       .name = "rtw_8822be",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8822be_id_table,
        .probe = rtw_pci_probe,
        .remove = rtw_pci_remove,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
index 31d8645f83bd562a878b6e060e36644c3d1d8807..744781dcb419442a96586f91562255852043a9a2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
@@ -20,7 +20,7 @@ static const struct sdio_device_id rtw_8822bs_id_table[] =  {
 MODULE_DEVICE_TABLE(sdio, rtw_8822bs_id_table);
 
 static struct sdio_driver rtw_8822bs_driver = {
-       .name = "rtw_8822bs",
+       .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
        .id_table = rtw_8822bs_id_table,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bu.c b/drivers/net/wireless/realtek/rtw88/rtw8822bu.c
index 572d1f31832ee49d5f4a6c8a615280e73ac9507b..5fdc36c88a762e86de35d03692f93efc41dd736e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822bu.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822bu.c
@@ -88,7 +88,7 @@ static int rtw8822bu_probe(struct usb_interface *intf,
 }
 
 static struct usb_driver rtw_8822bu_driver = {
-       .name = "rtw_8822bu",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8822bu_id_table,
        .probe = rtw8822bu_probe,
        .disconnect = rtw_usb_disconnect,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822ce.c b/drivers/net/wireless/realtek/rtw88/rtw8822ce.c
index e26c6bc82936307063e3d23bdfb23667e6bed7f3..9def732480af273c1ca598c4d2bbcbb822d4ebd2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822ce.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822ce.c
@@ -21,7 +21,7 @@ static const struct pci_device_id rtw_8822ce_id_table[] = {
 MODULE_DEVICE_TABLE(pci, rtw_8822ce_id_table);
 
 static struct pci_driver rtw_8822ce_driver = {
-       .name = "rtw_8822ce",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8822ce_id_table,
        .probe = rtw_pci_probe,
        .remove = rtw_pci_remove,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c
index 975e81c824f2e2d962b0918e2f89a99927cee771..322281e07eb8c35aea8ec8bff863075453e2d138 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c
@@ -20,7 +20,7 @@ static const struct sdio_device_id rtw_8822cs_id_table[] =  {
 MODULE_DEVICE_TABLE(sdio, rtw_8822cs_id_table);
 
 static struct sdio_driver rtw_8822cs_driver = {
-       .name = "rtw_8822cs",
+       .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
        .id_table = rtw_8822cs_id_table,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cu.c b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c
index 157d5102a4b1db8faa6207a9fb44b7720ae227f7..324fd5c8bfd4405bf5ec1053357cec074829cb5b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822cu.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c
@@ -32,7 +32,7 @@ static int rtw8822cu_probe(struct usb_interface *intf,
 }
 
 static struct usb_driver rtw_8822cu_driver = {
-       .name = "rtw_8822cu",
+       .name = KBUILD_MODNAME,
        .id_table = rtw_8822cu_id_table,
        .probe = rtw8822cu_probe,
        .disconnect = rtw_usb_disconnect,