[PATCH] rapidio: remove choice for enumeration

[PATCH] rapidio: remove choice for enumeration

[Masahiro Yamada]

This is the last use of the tristate choice.

This choice was introduced a decade ago by commit a11650e11093
("rapidio: make enumeration/discovery configurable"). Since then,
RAPIDIO_ENUM_BASIC has always been the sole member.

There was no need to have this choice block.

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

 drivers/rapidio/Kconfig | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index b9f8514909bf..f1d742ac8f7c 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -59,26 +59,13 @@ config RAPIDIO_DEBUG
 
 	  If you are unsure about this, say N here.
 
-choice
-	prompt "Enumeration method"
-	depends on RAPIDIO
-	default RAPIDIO_ENUM_BASIC
-	help
-	  There are different enumeration and discovery mechanisms offered
-	  for RapidIO subsystem. You may select single built-in method or
-	  or any number of methods to be built as modules.
-	  Selecting a built-in method disables use of loadable methods.
-
-	  If unsure, select Basic built-in.
-
 config RAPIDIO_ENUM_BASIC
-	tristate "Basic"
+	tristate "Basic Enumeration method"
+	depends on RAPIDIO
 	help
 	  This option includes basic RapidIO fabric enumeration and discovery
 	  mechanism similar to one described in RapidIO specification Annex 1.
 
-endchoice
-
 config RAPIDIO_CHMAN
 	tristate "RapidIO Channelized Messaging driver"
 	depends on RAPIDIO
-- 
2.40.1

Re: [PATCH] rapidio: remove choice for enumeration

[Masahiro Yamada]

To: Rapidio maintainers


I applied this to linux-kbuild.
If this change is not OK, please let me know.



On Sat, May 11, 2024 at 9:10 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> This is the last use of the tristate choice.
>
> This choice was introduced a decade ago by commit a11650e11093
> ("rapidio: make enumeration/discovery configurable"). Since then,
> RAPIDIO_ENUM_BASIC has always been the sole member.
>
> There was no need to have this choice block.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
>  drivers/rapidio/Kconfig | 17 ++---------------
>  1 file changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
> index b9f8514909bf..f1d742ac8f7c 100644
> --- a/drivers/rapidio/Kconfig
> +++ b/drivers/rapidio/Kconfig
> @@ -59,26 +59,13 @@ config RAPIDIO_DEBUG
>
>           If you are unsure about this, say N here.
>
> -choice
> -       prompt "Enumeration method"
> -       depends on RAPIDIO
> -       default RAPIDIO_ENUM_BASIC
> -       help
> -         There are different enumeration and discovery mechanisms offered
> -         for RapidIO subsystem. You may select single built-in method or
> -         or any number of methods to be built as modules.
> -         Selecting a built-in method disables use of loadable methods.
> -
> -         If unsure, select Basic built-in.
> -
>  config RAPIDIO_ENUM_BASIC
> -       tristate "Basic"
> +       tristate "Basic Enumeration method"
> +       depends on RAPIDIO
>         help
>           This option includes basic RapidIO fabric enumeration and discovery
>           mechanism similar to one described in RapidIO specification Annex 1.
>
> -endchoice
> -
>  config RAPIDIO_CHMAN
>         tristate "RapidIO Channelized Messaging driver"
>         depends on RAPIDIO
> --
> 2.40.1
>


-- 
Best Regards
Masahiro Yamada