usb: config: Fix incorrect use of keywordsLA.AU.0.0.1-04220-sa8155_gvmq.0

Use 'QTI' string in config names to fix incorrect usage.

Change-Id: I3af8a34653b8d67eb1263e9d5d162688ff381898
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>

9 files changed, 17 insertions, 17 deletions

diff --git a/drivers/char/diag/Kconfig b/drivers/char/diag/Kconfig
index 2a5e5fc7dbb4..5feb999123fd 100644
--- a/drivers/char/diag/Kconfig
+++ b/drivers/char/diag/Kconfig
@@ -27,7 +27,7 @@ config DIAG_OVER_USB
 config DIAGFWD_BRIDGE_CODE
 	bool "Enable remote DIAG traffic over MHI/HSIC"
 	depends on DIAG_CHAR
-	depends on USB_QCOM_DIAG_BRIDGE || MHI_BUS
+	depends on USB_QTI_DIAG_BRIDGE || MHI_BUS
 	default y
 	help
 	  MHI/HSIC Transport Layer for DIAG Router. When the MHI/HSIC endpoints
diff --git a/drivers/char/diag/Makefile b/drivers/char/diag/Makefile
index 2797100588ce..5ffb360d1f40 100644
--- a/drivers/char/diag/Makefile
+++ b/drivers/char/diag/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_DIAG_CHAR) := diagchar.o
 obj-$(CONFIG_DIAGFWD_BRIDGE_CODE) += diagfwd_bridge.o
-obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_hsic.o
+obj-$(CONFIG_USB_QTI_DIAG_BRIDGE) += diagfwd_hsic.o
 obj-$(CONFIG_MHI_BUS) += diagfwd_mhi.o
 diagchar-objs := diagchar_core.o diagchar_hdlc.o diagfwd.o diagfwd_peripheral.o diagfwd_socket.o diagfwd_rpmsg.o diag_mux.o diag_memorydevice.o diag_usb.o diagmem.o diagfwd_cntl.o diag_dci.o diag_masks.o diag_debugfs.o diag_pcie.o
diff --git a/drivers/char/diag/diag_debugfs.c b/drivers/char/diag/diag_debugfs.c
index 73b7f194b984..6910d5c81001 100644
--- a/drivers/char/diag/diag_debugfs.c
+++ b/drivers/char/diag/diag_debugfs.c
@@ -21,7 +21,7 @@
 #ifdef CONFIG_DIAGFWD_BRIDGE_CODE
 #include "diagfwd_bridge.h"
 #endif
-#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE
+#ifdef CONFIG_USB_QTI_DIAG_BRIDGE
 #include "diagfwd_hsic.h"
 #endif
 #ifdef CONFIG_MHI_BUS
@@ -781,7 +781,7 @@ static ssize_t diag_dbgfs_write_debug(struct file *fp, const char __user *buf,
 #endif
 
 #ifdef CONFIG_DIAGFWD_BRIDGE_CODE
-#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE
+#ifdef CONFIG_USB_QTI_DIAG_BRIDGE
 static ssize_t diag_dbgfs_read_hsicinfo(struct file *file, char __user *ubuf,
 					size_t count, loff_t *ppos)
 {
@@ -1104,7 +1104,7 @@ int diag_debugfs_init(void)
 				    &diag_dbgfs_bridge_ops);
 	if (!entry)
 		goto err;
-#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE
+#ifdef CONFIG_USB_QTI_DIAG_BRIDGE
 	entry = debugfs_create_file("hsicinfo", 0444, diag_dbgfs_dent, 0,
 				    &diag_dbgfs_hsicinfo_ops);
 	if (!entry)
diff --git a/drivers/char/diag/diagfwd_bridge.c b/drivers/char/diag/diagfwd_bridge.c
index 27f7aacc4825..c417c31e7a45 100644
--- a/drivers/char/diag/diagfwd_bridge.c
+++ b/drivers/char/diag/diagfwd_bridge.c
@@ -273,7 +273,7 @@ uint16_t diag_get_remote_device_mask(void)
 
 void diag_register_with_bridge(void)
 {
-	if (IS_ENABLED(CONFIG_USB_QCOM_DIAG_BRIDGE))
+	if (IS_ENABLED(CONFIG_USB_QTI_DIAG_BRIDGE))
 		diag_register_with_hsic();
 	else if (IS_ENABLED(CONFIG_MHI_BUS))
 		diag_register_with_mhi();
@@ -281,7 +281,7 @@ void diag_register_with_bridge(void)
 
 void diag_unregister_bridge(void)
 {
-	if (IS_ENABLED(CONFIG_USB_QCOM_DIAG_BRIDGE))
+	if (IS_ENABLED(CONFIG_USB_QTI_DIAG_BRIDGE))
 		diag_unregister_hsic();
 	else if (IS_ENABLED(CONFIG_MHI_BUS))
 		diag_unregister_mhi();
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index e1cfe2300938..05d6735421ce 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -624,7 +624,7 @@ config USB_CONFIGFS_F_IPC
 config USB_CONFIGFS_F_MDM_DATA
 	bool "USB QTI Modem Data function"
 	select USB_F_MDM_DATA
-	depends on USB_CONFIGFS && USB_QCOM_MDM_DATA_BRIDGE
+	depends on USB_CONFIGFS && USB_QTI_MDM_DATA_BRIDGE
 	help
 	  USB QTI modem data function driver.
 
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 55e49d44d5c2..b65284352bf9 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -288,7 +288,7 @@ config USB_TYPEC_MUX_NXP5150A
 	  Say Y here if you want to use NXP CC Logic Type-C Chipset NXP5150A
 	  for CC detection and Mux control.
 
-config USB_QCOM_DIAG_BRIDGE
+config USB_QTI_DIAG_BRIDGE
 	tristate "USB QTI diagnostic bridge driver"
 	depends on USB
 	help
@@ -299,7 +299,7 @@ config USB_QCOM_DIAG_BRIDGE
 	  To compile this driver as a module, choose M here: the
 	  module will be called diag_bridge.  If unsure, choose N.
 
-config USB_QCOM_MDM_DATA_BRIDGE
+config USB_QTI_MDM_DATA_BRIDGE
 	tristate "USB QTI modem data bridge driver"
 	select USB_CONFIGFS_F_MDM_DATA
 	depends on USB
@@ -310,7 +310,7 @@ config USB_QCOM_MDM_DATA_BRIDGE
 	  To compile this driver as a module, choose M here: the module
 	  will be called mdm_data_bridge. If unsure, choose N.
 
-config USB_QCOM_KS_BRIDGE
+config USB_QTI_KS_BRIDGE
 	tristate "USB QTI kick start bridge driver"
 	depends on USB
 	help
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index ffa56f53548f..9d7453d9815a 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -33,6 +33,6 @@ obj-$(CONFIG_USB_TYPEC_MUX_NXP5150A)	+= nxp_typec.o
 obj-$(CONFIG_USB_SISUSBVGA)		+= sisusbvga/
 obj-$(CONFIG_USB_LINK_LAYER_TEST)	+= lvstest.o
 obj-$(CONFIG_USB_REDRIVER_NB7VPQ904M)	+= ssusb-redriver-nb7vpq904m.o
-obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE)	+= diag_bridge.o
-obj-$(CONFIG_USB_QCOM_MDM_DATA_BRIDGE)	+= mdm_data_bridge.o
-obj-$(CONFIG_USB_QCOM_KS_BRIDGE)	+= ks_bridge.o
+obj-$(CONFIG_USB_QTI_DIAG_BRIDGE)	+= diag_bridge.o
+obj-$(CONFIG_USB_QTI_MDM_DATA_BRIDGE)	+= mdm_data_bridge.o
+obj-$(CONFIG_USB_QTI_KS_BRIDGE)		+= ks_bridge.o
diff --git a/include/linux/usb/diag_bridge.h b/include/linux/usb/diag_bridge.h
index 806b380a83ba..b3d4f2f4fb5c 100644
--- a/include/linux/usb/diag_bridge.h
+++ b/include/linux/usb/diag_bridge.h
@@ -23,7 +23,7 @@ struct diag_bridge_ops {
 	void (*resume)(void *ctxt);
 };
 
-#if IS_ENABLED(CONFIG_USB_QCOM_DIAG_BRIDGE)
+#if IS_ENABLED(CONFIG_USB_QTI_DIAG_BRIDGE)
 
 extern int diag_bridge_read(int id, char *data, int size);
 extern int diag_bridge_write(int id, char *data, int size);
diff --git a/include/linux/usb/usb_bridge.h b/include/linux/usb/usb_bridge.h
index a270419fa535..c4315b743dcb 100644
--- a/include/linux/usb/usb_bridge.h
+++ b/include/linux/usb/usb_bridge.h
@@ -85,8 +85,8 @@ struct timestamp_buf {
 	rwlock_t	lck;   /* lock */
 };
 
-#if defined(CONFIG_USB_QCOM_MDM_BRIDGE) ||	\
-	defined(CONFIG_USB_QCOM_MDM_BRIDGE_MODULE)
+#if defined(CONFIG_USB_QTI_MDM_DATA_BRIDGE) ||	\
+	defined(CONFIG_USB_QTI_MDM_DATA_BRIDGE_MODULE)
 
 /* Bridge APIs called by gadget driver */
 int data_bridge_open(struct bridge *brdg);