From patchwork Tue Feb 7 13:13:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9560029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46C91602B1 for ; Tue, 7 Feb 2017 13:16:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39F69204C2 for ; Tue, 7 Feb 2017 13:16:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E81427CEA; Tue, 7 Feb 2017 13:16:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49B8C2819A for ; Tue, 7 Feb 2017 13:16:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932103AbdBGNQ2 (ORCPT ); Tue, 7 Feb 2017 08:16:28 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:51623 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754759AbdBGNQP (ORCPT ); Tue, 7 Feb 2017 08:16:15 -0500 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MINbz-1caGNZ1gYp-00482D; Tue, 07 Feb 2017 14:14:02 +0100 From: Arnd Bergmann To: Dmitry Torokhov Cc: Arnd Bergmann , Andrew Duggan , Guenter Roeck , Christopher Heiny , Benjamin Tissoires , Nick Dyer , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [PATCH] Input: synaptics-rmi4 - select 'SERIO' when needed Date: Tue, 7 Feb 2017 14:13:28 +0100 Message-Id: <20170207131357.694909-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:KGElFNmo9IWFGtU2P3mSudncezg+grRbZNfRkczosa2pHhnEG67 ASw9af3tO84WPri6Ft0wmiZDVFKZqTFnY5EDEmO6I4P3JxkBEHIGsqVxIQq/jgsdWPfO4zP ASCC7NzQIOPZISBQr3Sy4YhsKJWcnfCsk9rRPVruogX+O7lYJN6jIcuziqKAPkwk2IaXHL2 ysnxmXRRpNfkiePoERJ6Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:J/eZ9czyFgM=:fFygeoH+kuwC5dCpRITbet zCId3j1KSTXw66BpyPjjKj471mq3pHTGH3shkBN+0N2zxPA0Npkcml9BN2aJaiJ6pusPdLdDr L2LnY3ITemyWWqHKnZNOUnxjLjxX+QWWNPDOg0zyzURIwFhXYiR02m03nen22JHeObKcPDxtd lGRFAHWqoQO03hnjt0Wa2izU5ilEfffMBSFqFj9ZdRanDoccj8RMTZub2T7ytIXrjiXu8BZNn 9zVGsWH5JWVKxO7hV67LxhyP5E/BtvjHszA1Tkn8AgdjzkviXbhH1bixJpvuijDOevPhdx9AP 0gPLBSh1CSrItrv0/Uf4tZHKvAKfBKXvD3kW7IjxhQcyghc3nn9CSAMahB4jhYW/j0nHdrnc+ 0m4MsFr+Rf2Qa7Huk42qchi4hVa5o58cS41cCv5NZO/v32wHgqE7IQqTSgPSvVbP7hke3BwL5 FVPI18lnz+09l8Hx3rPM1FdIWdYEqirg6jnCp+9TbEFbdRV3Qi5XqaR3Mm+TgLFwQv638vsoR kNEUrZc2VHybQdOwbGyS59uSHd29D7rQJu1axmzXZeMZOXPxxap4gnYZ+MdTP6oEglSuS/cmj vSdvxpV2eR510SFZzmQuWo5HtDvkVSYU/9QgP2UVQ2G+Rhnss2VsjKIKvIospQX3w8bsMcyrl 06bOn2SXIImntM2CNNbFrmWzghLPbJVpqUoWaOzo2IjDrgH0ZOTxFV5jsOe2mR/vEQpU= Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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