staging: r8188eu: attach newly imported driver to build system

Modify Kconfig and Makefile to import new r8188eu driver into build
system, and allow it to build alongside deprecated older driver, by
tweaking build parameters and module name for the older driver at
the same time.

Suggested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210727232219.2948-7-phil@philpotter.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 03ee99d98945fc4d01956305dc29f48020921d12..73fd57bfa95a3921f0a5b32d90f5855ceae7d93e 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -38,6 +38,8 @@ source "drivers/staging/rtl8712/Kconfig"
 
 source "drivers/staging/rtl8188eu/Kconfig"
 
+source "drivers/staging/r8188eu/Kconfig"
+
 source "drivers/staging/rts5208/Kconfig"
 
 source "drivers/staging/octeon/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 9a4c0e6f34d55d8755206e1a3ddc66ae66214d1a..47672260293e451bd4a201bcce2932f362a808ca 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -8,7 +8,8 @@ obj-$(CONFIG_RTL8192U)          += rtl8192u/
 obj-$(CONFIG_RTL8192E)         += rtl8192e/
 obj-$(CONFIG_RTL8723BS)                += rtl8723bs/
 obj-$(CONFIG_R8712U)           += rtl8712/
-obj-$(CONFIG_R8188EU)          += rtl8188eu/
+obj-$(CONFIG_R8188EU_OLD)      += rtl8188eu/
+obj-$(CONFIG_R8188EU)          += r8188eu/
 obj-$(CONFIG_RTS5208)          += rts5208/
 obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/
 obj-$(CONFIG_OCTEON_ETHERNET)  += octeon/

diff --git a/drivers/staging/rtl8188eu/Kconfig b/drivers/staging/rtl8188eu/Kconfig
index 970d5abd6336389a15b646ddf13ffc594e4f2372..acdf0f9f374c290ba00a1994e6777b11c4af11dc 100644 (file)
--- a/drivers/staging/rtl8188eu/Kconfig
+++ b/drivers/staging/rtl8188eu/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-config R8188EU
-       tristate "Realtek RTL8188EU Wireless LAN NIC driver"
+config R8188EU_OLD
+       tristate "Realtek RTL8188EU Wireless LAN NIC driver (DEPRECATED)"
        depends on WLAN && USB && CFG80211
        depends on m
        select WIRELESS_EXT
@@ -10,9 +10,10 @@ config R8188EU
        select LIB80211_CRYPT_CCMP
        help
        This option adds the Realtek RTL8188EU USB device such as TP-Link TL-WN725N.
-       If built as a module, it will be called r8188eu.
+       If built as a module, it will be called rtl8188eu. This driver is now due to
+       be dropped due to the import of a newer version.
 
-if R8188EU
+if R8188EU_OLD
 
 config 88EU_AP_MODE
        bool "Realtek RTL8188EU AP mode"

diff --git a/drivers/staging/rtl8188eu/Makefile b/drivers/staging/rtl8188eu/Makefile
index 2799ec5a7fda95b8354f514b5b14445f7cd982df..20d88983f4e2c81a8428e4f966663b6e2ed289b6 100644 (file)
--- a/drivers/staging/rtl8188eu/Makefile
+++ b/drivers/staging/rtl8188eu/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-r8188eu-y :=                           \
+rtl8188eu-y :=                         \
                core/mac_cfg.o          \
                core/rtw_ap.o           \
                core/rtw_cmd.o          \
@@ -51,6 +51,6 @@ r8188eu-y :=                          \
                os_dep/usb_ops_linux.o  \
                os_dep/xmit_linux.o
 
-obj-$(CONFIG_R8188EU)  := r8188eu.o
+obj-$(CONFIG_R8188EU_OLD)      := rtl8188eu.o
 
 ccflags-y += -I$(srctree)/$(src)/include