Adjust driver bits so it keeps the name of the replaced driver

Signed-off-by: Thomas Backlund <tmb@mageia.org>

---
 drivers/staging/rtl8812au/Kconfig                       |    7 +++----
 drivers/staging/rtl8812au/Makefile                      |    8 ++++----
 drivers/staging/rtl8812au/hal/hal_com.c                 |    2 +-
 drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c |    2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff -Nurp linux-6.1-rtl8812au/drivers/staging/rtl8812au/hal/hal_com.c linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/hal/hal_com.c
--- linux-6.1-rtl8812au/drivers/staging/rtl8812au/hal/hal_com.c	2022-12-18 18:08:17.606767673 +0200
+++ linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/hal/hal_com.c	2022-12-18 18:40:12.974573785 +0200
@@ -12879,7 +12879,7 @@ bypass_hw_pg:
 	_rtw_memset(hal_data->EEPROMMACAddr, 0, ETH_ALEN);
 	ret = _FAIL;
 exit:
-	dev_info(&udev->dev, "88XXau %pM hw_info[%02x]", hw_addr, addr_offset);
+	dev_info(&udev->dev, "8812au %pM hw_info[%02x]", hw_addr, addr_offset);
 	return ret;
 }
 
diff -Nurp linux-6.1-rtl8812au/drivers/staging/rtl8812au/Kconfig linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/Kconfig
--- linux-6.1-rtl8812au/drivers/staging/rtl8812au/Kconfig	2022-12-18 18:08:17.494767684 +0200
+++ linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/Kconfig	2022-12-18 18:40:12.974573785 +0200
@@ -1,6 +1,5 @@
-config 88XXAU
-	tristate "Realtek 88XXau USB WiFi"
+config RTL8812AU
+	tristate "Realtek 8812au USB WiFi"
 	depends on USB
 	help
-	  Help message of 88XXau
-
+	  Help message of 8812au
diff -Nurp linux-6.1-rtl8812au/drivers/staging/rtl8812au/Makefile linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/Makefile
--- linux-6.1-rtl8812au/drivers/staging/rtl8812au/Makefile	2022-12-18 18:08:17.495767684 +0200
+++ linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/Makefile	2022-12-18 18:40:12.974573785 +0200
@@ -189,9 +189,9 @@ endif
 
 ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
 
-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\"
+EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\"
 ifeq ($(CONFIG_USB_HCI), y)
-USER_MODULE_NAME = 88XXau
+USER_MODULE_NAME = 8812au
 endif
 else
 EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\"
@@ -2246,11 +2246,11 @@ $(MODULE_NAME)-y += $(_PLATFORM_FILES)
 
 $(MODULE_NAME)-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o
 
-obj-$(CONFIG_88XXAU) := $(MODULE_NAME).o
+obj-$(CONFIG_RTL8812AU) := $(MODULE_NAME).o
 
 else
 
-export CONFIG_88XXAU = m
+export CONFIG_RTL8812AU = m
 
 all: modules
 
diff -Nurp linux-6.1-rtl8812au/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
--- linux-6.1-rtl8812au/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c	2022-12-18 18:08:17.649767669 +0200
+++ linux-6.1-rtl8812au-rename/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c	2022-12-18 18:40:12.976573784 +0200
@@ -2675,7 +2675,7 @@ void rtw_cfg80211_unlink_bss(_adapter *p
 #endif
 
 	if (!wiphy) {
-		pr_info("88XXAU: rtw_cfg80211_unlink_bss: wiphy is NULL\n");
+		pr_info("8812AU: rtw_cfg80211_unlink_bss: wiphy is NULL\n");
 		return;
 	}