usb: use "prompt" instead of "bool" for choice prompts

Since commit fde192511bdb ("kconfig: remove tristate choice support"),
all choice blocks are now boolean. There is no longer a need to specify
the choice type explicitly.

Most choice blocks already use "prompt". Before the next commit removes
support for the "bool" syntax in choice entries, this commit converts
the remaining "bool" occurences under drivers/usb/.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig
index c131719..d7af55a 100644 (file)
--- a/drivers/usb/dwc2/Kconfig
+++ b/drivers/usb/dwc2/Kconfig
@@ -21,7 +21,7 @@ config USB_DWC2
 if USB_DWC2
 
 choice
-       bool "DWC2 Mode Selection"
+       prompt "DWC2 Mode Selection"
        default USB_DWC2_DUAL_ROLE if (USB && USB_GADGET)
        default USB_DWC2_HOST if (USB && !USB_GADGET)
        default USB_DWC2_PERIPHERAL if (!USB && USB_GADGET)

diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 31078f3..310d182 100644 (file)
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -23,7 +23,7 @@ config USB_DWC3_ULPI
          controller.
 
 choice
-       bool "DWC3 Mode Selection"
+       prompt "DWC3 Mode Selection"
        default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)
        default USB_DWC3_HOST if (USB && !USB_GADGET)
        default USB_DWC3_GADGET if (!USB && USB_GADGET)

diff --git a/drivers/usb/isp1760/Kconfig b/drivers/usb/isp1760/Kconfig
index 2ed2b73..e19178f 100644 (file)
--- a/drivers/usb/isp1760/Kconfig
+++ b/drivers/usb/isp1760/Kconfig
@@ -26,7 +26,7 @@ config USB_ISP1761_UDC
 if USB_ISP1760
 
 choice
-       bool "ISP1760 Mode Selection"
+       prompt "ISP1760 Mode Selection"
        default USB_ISP1760_DUAL_ROLE if (USB && USB_GADGET)
        default USB_ISP1760_HOST_ROLE if (USB && !USB_GADGET)
        default USB_ISP1760_GADGET_ROLE if (!USB && USB_GADGET)

diff --git a/drivers/usb/mtu3/Kconfig b/drivers/usb/mtu3/Kconfig
index bf98fd3..d281da1 100644 (file)
--- a/drivers/usb/mtu3/Kconfig
+++ b/drivers/usb/mtu3/Kconfig
@@ -21,7 +21,7 @@ config USB_MTU3
 
 if USB_MTU3
 choice
-       bool "MTU3 Mode Selection"
+       prompt "MTU3 Mode Selection"
        default USB_MTU3_DUAL_ROLE if (USB && USB_GADGET)
        default USB_MTU3_HOST if (USB && !USB_GADGET)
        default USB_MTU3_GADGET if (!USB && USB_GADGET)

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 9a8cf3d..9e45d12 100644 (file)
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -29,7 +29,7 @@ config USB_MUSB_HDRC
 if USB_MUSB_HDRC
 
 choice
-       bool "MUSB Mode Selection"
+       prompt "MUSB Mode Selection"
        default USB_MUSB_DUAL_ROLE if (USB && USB_GADGET)
        default USB_MUSB_HOST if (USB && !USB_GADGET)
        default USB_MUSB_GADGET if (!USB && USB_GADGET)