Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -6
+1 -1
arch/mips/configs/gcw0_defconfig
··· 96 96 CONFIG_USB_CONN_GPIO=y 97 97 CONFIG_USB=y 98 98 CONFIG_USB_OTG=y 99 - CONFIG_USB_OTG_BLACKLIST_HUB=y 99 + CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB=y 100 100 CONFIG_USB_OHCI_HCD=y 101 101 CONFIG_USB_OHCI_HCD_PLATFORM=y 102 102 CONFIG_USB_MUSB_HDRC=y
+1 -1
drivers/usb/core/Kconfig
··· 66 66 "Targeted Peripherals List". "Embedded Hosts" are likewise 67 67 allowed to support only a limited number of peripherals. 68 68 69 - config USB_OTG_BLACKLIST_HUB 69 + config USB_OTG_DISABLE_EXTERNAL_HUB 70 70 bool "Disable external hubs" 71 71 depends on USB_OTG || EXPERT 72 72 help
+1 -1
drivers/usb/core/hub.c
··· 1834 1834 return -E2BIG; 1835 1835 } 1836 1836 1837 - #ifdef CONFIG_USB_OTG_BLACKLIST_HUB 1837 + #ifdef CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB 1838 1838 if (hdev->parent) { 1839 1839 dev_warn(&intf->dev, "ignoring external hub\n"); 1840 1840 return -ENODEV;
+1 -1
drivers/usb/musb/Kconfig
··· 113 113 depends on OF 114 114 depends on MIPS || COMPILE_TEST 115 115 depends on USB_MUSB_GADGET 116 - depends on USB=n || USB_OTG_BLACKLIST_HUB 116 + depends on USB=n || USB_OTG_DISABLE_EXTERNAL_HUB 117 117 select USB_ROLE_SWITCH 118 118 119 119 config USB_MUSB_MEDIATEK
+2 -2
drivers/usb/musb/musb_core.c
··· 1637 1637 musb->is_multipoint = 0; 1638 1638 type = ""; 1639 1639 if (IS_ENABLED(CONFIG_USB) && 1640 - !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) { 1641 - pr_err("%s: kernel must blacklist external hubs\n", 1640 + !IS_ENABLED(CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB)) { 1641 + pr_err("%s: kernel must disable external hubs, please fix the configuration\n", 1642 1642 musb_driver_name); 1643 1643 } 1644 1644 }