USB: rename USB OTG hub configuration option

The USB OTG code has the ability to disable external hubs, but the
configuration option for it is oddly named.  Rename it to be more
obvious as to what it does.

Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Bin Liu <b-liu@ti.com>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Eugeniu Rosca <erosca@de.adit-jv.com>
Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: David Heinzelmann <heinzelmann.david@gmail.com>
Cc: "Lee, Chiasheng" <chiasheng.lee@intel.com>
Cc: Keiya Nobuta <nobuta.keiya@fujitsu.com>
Cc: Hardik Gajjar <hgajjar@de.adit-jv.com>
Link: https://lore.kernel.org/r/20200618094300.1887727-3-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/mips/configs/gcw0_defconfig b/arch/mips/configs/gcw0_defconfig
index 48131cb47e66216312a686a7ea41bc690a00558f..4994749b9eaad9554ad7166e29fb7593596b7d1a 100644 (file)
--- a/arch/mips/configs/gcw0_defconfig
+++ b/arch/mips/configs/gcw0_defconfig
@@ -96,7 +96,7 @@ CONFIG_SND_SIMPLE_CARD=y
 CONFIG_USB_CONN_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_OTG=y
-CONFIG_USB_OTG_BLACKLIST_HUB=y
+CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_MUSB_HDRC=y

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index ecaacc8ed31185324fa6c8e6e5281ceedf66064b..06bae55860e458c8cf7f872acfa97a7cc7a9b306 100644 (file)
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -66,7 +66,7 @@ config USB_OTG_WHITELIST
          "Targeted Peripherals List".  "Embedded Hosts" are likewise
          allowed to support only a limited number of peripherals.
 
-config USB_OTG_BLACKLIST_HUB
+config USB_OTG_DISABLE_EXTERNAL_HUB
        bool "Disable external hubs"
        depends on USB_OTG || EXPERT
        help

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index b1e14beaac5f76a075562a3c5bc1fbd2e3e3aba3..ab26ac0147f76ae8c3183288d41197438c9fe304 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1834,7 +1834,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
                return -E2BIG;
        }
 
-#ifdef CONFIG_USB_OTG_BLACKLIST_HUB
+#ifdef CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB
        if (hdev->parent) {
                dev_warn(&intf->dev, "ignoring external hub\n");
                return -ENODEV;

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 3b0d1c20ebe67bf737e23882e4127906fc6c9515..8de143807c1aec12692923da04c455f3e99d953a 100644 (file)
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -113,7 +113,7 @@ config USB_MUSB_JZ4740
        depends on OF
        depends on MIPS || COMPILE_TEST
        depends on USB_MUSB_GADGET
-       depends on USB=n || USB_OTG_BLACKLIST_HUB
+       depends on USB=n || USB_OTG_DISABLE_EXTERNAL_HUB
        select USB_ROLE_SWITCH
 
 config USB_MUSB_MEDIATEK

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 384a8039a7fd5d59aeeb4c5ae0466ab6626d2329..5a56a03996b1df9d68d3a1b5d59492256e8b52a9 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1637,8 +1637,8 @@ static int musb_core_init(u16 musb_type, struct musb *musb)
                musb->is_multipoint = 0;
                type = "";
                if (IS_ENABLED(CONFIG_USB) &&
-                   !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) {
-                       pr_err("%s: kernel must blacklist external hubs\n",
+                   !IS_ENABLED(CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB)) {
+                       pr_err("%s: kernel must disable external hubs, please fix the configuration\n",
                               musb_driver_name);
                }
        }