[PATCH 1/2] input: misc: e3x0-button: Fix typo in module name

[PATCH 1/2] input: misc: e3x0-button: Fix typo in module name

[Moritz Fischer]

The produced module will be called e3x0-button, not
e3x0_button.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
---
 drivers/input/misc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 906dd1b..7ac277c7 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -101,7 +101,7 @@ config INPUT_E3X0_BUTTON
 	  USRP E3x0 Button.
 
 	  To compile this driver as a module, choose M here: the
-	  module will be called e3x0_button.
+	  module will be called e3x0-button.
 
 config INPUT_PCSPKR
 	tristate "PC Speaker support"
-- 
2.6.2

[PATCH 2/2] input: misc: e3x0-button: Update Kconfig description

[Moritz Fischer]

The driver is now used for the entire USRP e3xx series,
this commit fixes the description that will be displayed in
the menu accordingly.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
---
 drivers/input/misc/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7ac277c7..a676c2c 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -94,11 +94,11 @@ config INPUT_BMA150
 	  module will be called bma150.
 
 config INPUT_E3X0_BUTTON
-	tristate "NI Ettus Research USRP E3x0 Button support."
+	tristate "NI Ettus Research USRP E3xx Button support."
 	default n
 	help
 	  Say Y here to enable support for the NI Ettus Research
-	  USRP E3x0 Button.
+	  USRP E3xx Button.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called e3x0-button.
-- 
2.6.2

Re: [PATCH 1/2] input: misc: e3x0-button: Fix typo in module name

[Dmitry Torokhov]

Hi Moritz,

On Sun, Oct 25, 2015 at 01:06:06PM -0700, Moritz Fischer wrote:
> The produced module will be called e3x0-button, not
> e3x0_button.

This is not entirely correct. The file name is e3x0-button.ko, but the
module name is e3x0_button: when we construct KBUILD_MODNAME we
substitute commas and dashes for underscores - see scripts/Makefile.lib

> 
> Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
> ---
>  drivers/input/misc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
> index 906dd1b..7ac277c7 100644
> --- a/drivers/input/misc/Kconfig
> +++ b/drivers/input/misc/Kconfig
> @@ -101,7 +101,7 @@ config INPUT_E3X0_BUTTON
>  	  USRP E3x0 Button.
>  
>  	  To compile this driver as a module, choose M here: the
> -	  module will be called e3x0_button.
> +	  module will be called e3x0-button.
>  
>  config INPUT_PCSPKR
>  	tristate "PC Speaker support"
> -- 
> 2.6.2
> 

Thanks.

-- 
Dmitry

Re: [PATCH 2/2] input: misc: e3x0-button: Update Kconfig description

[Dmitry Torokhov]

On Sun, Oct 25, 2015 at 01:06:07PM -0700, Moritz Fischer wrote:
> The driver is now used for the entire USRP e3xx series,
> this commit fixes the description that will be displayed in
> the menu accordingly.
> 
> Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>

Applied, thank you.

> ---
>  drivers/input/misc/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
> index 7ac277c7..a676c2c 100644
> --- a/drivers/input/misc/Kconfig
> +++ b/drivers/input/misc/Kconfig
> @@ -94,11 +94,11 @@ config INPUT_BMA150
>  	  module will be called bma150.
>  
>  config INPUT_E3X0_BUTTON
> -	tristate "NI Ettus Research USRP E3x0 Button support."
> +	tristate "NI Ettus Research USRP E3xx Button support."
>  	default n
>  	help
>  	  Say Y here to enable support for the NI Ettus Research
> -	  USRP E3x0 Button.
> +	  USRP E3xx Button.
>  
>  	  To compile this driver as a module, choose M here: the
>  	  module will be called e3x0-button.
> -- 
> 2.6.2
> 

-- 
Dmitry

Re: [PATCH 1/2] input: misc: e3x0-button: Fix typo in module name

[Moritz Fischer]

On Sun, Oct 25, 2015 at 1:49 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Hi Moritz,
>
> On Sun, Oct 25, 2015 at 01:06:06PM -0700, Moritz Fischer wrote:
>> The produced module will be called e3x0-button, not
>> e3x0_button.
>
> This is not entirely correct. The file name is e3x0-button.ko, but the
> module name is e3x0_button: when we construct KBUILD_MODNAME we
> substitute commas and dashes for underscores - see scripts/Makefile.lib

Thanks for the clarification. Good to know it wasn't broken in the first place.

Cheers,

Moritz