[PATCH] [PATCH] Input: synaptics-rmi4 - select 'SERIO' when needed

[PATCH] [PATCH] Input: synaptics-rmi4 - select 'SERIO' when needed

[Arnd Bergmann]

With CONFIG_SERIO=m, we get a build error for the rmi4-f03 driver,
added in linux-4.10:

warning: (HID_RMI) selects RMI4_F03 which has unmet direct dependencies (!UML && INPUT && RMI4_CORE && (SERIO=y || RMI4_CORE=SERIO))
drivers/input/built-in.o: In function `rmi_f03_attention':
rmi_f03.c:(.text+0xcfe0): undefined reference to `serio_interrupt'
rmi_f03.c:(.text+0xd055): undefined reference to `serio_interrupt'
drivers/input/built-in.o: In function `rmi_f03_remove':
rmi_f03.c:(.text+0xd115): undefined reference to `serio_unregister_port'
drivers/input/built-in.o: In function `rmi_f03_probe':
rmi_f03.c:(.text+0xd209): undefined reference to `__serio_register_port'

An earlier patch tried to fix this, but missed the HID_RMI driver that
does a 'select' on the F03 backend.

This adds a hidden Kconfig symbol that enforces 'serio' to be enabled
when RMI4-F03 is, which covers all cases.

Fixes: d7ddad0acc4a ("Input: synaptics-rmi4 - fix F03 build error when serio is module")
Fixes: c5e8848fc98e ("Input: synaptics-rmi4 - add support for F03")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Sorry for dropping the ball on this earlier, I had the patch in my
randconfig tree but didn't mark it appropriately so I only stumbled
over it today when it failed to apply.
---
 drivers/input/rmi4/Kconfig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig
index 78a78b99ec31..fd98a17925da 100644
--- a/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@ -43,13 +43,19 @@ config RMI4_SMB
 
 config RMI4_F03
 	bool "RMI4 Function 03 (PS2 Guest)"
-	depends on SERIO=y || RMI4_CORE=SERIO
 	help
 	  Say Y here if you want to add support for RMI4 function 03.
 
 	  Function 03 provides PS2 guest support for RMI4 devices. This
 	  includes support for TrackPoints on TouchPads.
 
+config RMI4_F03_SERIO
+	tristate
+	depends on RMI4_CORE
+	depends on RMI4_F03
+	default RMI4_CORE
+	select SERIO
+
 config RMI4_2D_SENSOR
 	bool
 
-- 
2.9.0

Re: [PATCH] [PATCH] Input: synaptics-rmi4 - select 'SERIO' when needed

[Dmitry Torokhov]

On Tue, Feb 07, 2017 at 02:13:28PM +0100, Arnd Bergmann wrote:
> With CONFIG_SERIO=m, we get a build error for the rmi4-f03 driver,
> added in linux-4.10:
> 
> warning: (HID_RMI) selects RMI4_F03 which has unmet direct dependencies (!UML && INPUT && RMI4_CORE && (SERIO=y || RMI4_CORE=SERIO))
> drivers/input/built-in.o: In function `rmi_f03_attention':
> rmi_f03.c:(.text+0xcfe0): undefined reference to `serio_interrupt'
> rmi_f03.c:(.text+0xd055): undefined reference to `serio_interrupt'
> drivers/input/built-in.o: In function `rmi_f03_remove':
> rmi_f03.c:(.text+0xd115): undefined reference to `serio_unregister_port'
> drivers/input/built-in.o: In function `rmi_f03_probe':
> rmi_f03.c:(.text+0xd209): undefined reference to `__serio_register_port'
> 
> An earlier patch tried to fix this, but missed the HID_RMI driver that
> does a 'select' on the F03 backend.
> 
> This adds a hidden Kconfig symbol that enforces 'serio' to be enabled
> when RMI4-F03 is, which covers all cases.
> 
> Fixes: d7ddad0acc4a ("Input: synaptics-rmi4 - fix F03 build error when serio is module")
> Fixes: c5e8848fc98e ("Input: synaptics-rmi4 - add support for F03")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied, thank you.

> ---
> Sorry for dropping the ball on this earlier, I had the patch in my
> randconfig tree but didn't mark it appropriately so I only stumbled
> over it today when it failed to apply.
> ---
>  drivers/input/rmi4/Kconfig | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig
> index 78a78b99ec31..fd98a17925da 100644
> --- a/drivers/input/rmi4/Kconfig
> +++ b/drivers/input/rmi4/Kconfig
> @@ -43,13 +43,19 @@ config RMI4_SMB
>  
>  config RMI4_F03
>  	bool "RMI4 Function 03 (PS2 Guest)"
> -	depends on SERIO=y || RMI4_CORE=SERIO
>  	help
>  	  Say Y here if you want to add support for RMI4 function 03.
>  
>  	  Function 03 provides PS2 guest support for RMI4 devices. This
>  	  includes support for TrackPoints on TouchPads.
>  
> +config RMI4_F03_SERIO
> +	tristate
> +	depends on RMI4_CORE
> +	depends on RMI4_F03
> +	default RMI4_CORE
> +	select SERIO
> +
>  config RMI4_2D_SENSOR
>  	bool
>  
> -- 
> 2.9.0
> 

-- 
Dmitry