From patchwork Tue Jun 9 10:06:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 187636 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp377584ilo; Tue, 9 Jun 2020 03:07:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUU7SzFmA/Q/D9lHO3li53+jgE8y0pCg2E2JghgiMjjbLMPGW9FqPEdGuFzC5ygITUN0Ko X-Received: by 2002:a17:906:3e5a:: with SMTP id t26mr23257259eji.165.1591697236362; Tue, 09 Jun 2020 03:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591697236; cv=none; d=google.com; s=arc-20160816; b=pwlIqxBLbHME/5c6+vKT65hpMLQHJh9l/78fsOPYLJ61r8KMe3plMu2SPU9utsbT4U NUHEYR3QIKXaIj3mpe4J7srhEg5HpmjE1glndOArPLqsl7QkADOmjALytoeIEE41oYvl 1I5z4uT4O3Bo/PvNN0Vbc9uX5N8Rq+x8M5EcNsSQkaA3eAwjHxc+q5Dc9Y6TXhH+2goc iua8PzDElum2r2GSP+/kgate7j4L88bv0d3uMTVmuyB1vV64FZt0TtvL2IjakjlNk60D RGhWsVxg2svqkP1xfBVlGG/LQIHguTpL4E0BWUacIUOLKn8bAfcJgNRWlSKWXDZMY2FE FS6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=wefd66rVk15jffeXmRDQNdFs+7I040LF1kH38ejwBYQ=; b=JBjs9geq2DLtNoaCnd7TYTCS6T1srDY7d2p299Ju/JVFr69ZEN3l0gizgfpnRlhVHm VAFYhrEeCxmL4bXHtKVMLjczDwE9vJU9pV5dBVls82fppVLqDqUzi5mw6VegC0tXjoj0 15I3yqDitj+M1e4zS742F/H8O9KWkjbaSTuX5fa7LcIM35N2kmrs+68Hw5ddnKngaUjN sEcfQ1VBmW08xByPrKJ0VR6hpWAU2KKrddAL3fAu45fevEb+E9LgVx0VS5HhnuHxL4gH CD/uV3liDlV3bP0aPjkPryugmYvvwc0kdyGqWN7F9PFslypqeXy37t8Yw3xhDOWjDxcG RKfg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gg10si10525020ejb.413.2020.06.09.03.07.16; Tue, 09 Jun 2020 03:07:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728629AbgFIKHM (ORCPT + 1 other); Tue, 9 Jun 2020 06:07:12 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:49735 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726286AbgFIKHL (ORCPT ); Tue, 9 Jun 2020 06:07:11 -0400 Received: from threadripper.lan ([149.172.98.151]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mi2eP-1j4qU50v2n-00e7rY; Tue, 09 Jun 2020 12:06:48 +0200 From: Arnd Bergmann To: Dmitry Torokhov Cc: Arnd Bergmann , Guenter Roeck , Greg Kroah-Hartman , Masahiro Yamada , linux-input@vger.kernel.org, Markus Koch , linux-kernel@vger.kernel.org Subject: [PATCH] Input: joystick - work around "adi" module name confict Date: Tue, 9 Jun 2020 12:06:33 +0200 Message-Id: <20200609100643.1245061-1-arnd@arndb.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:E1BYE3XcXEHjtosxrdg/fikSVlwD8VOcBmuHGtndGssMyxHHQEj xZbBbi/ZbSwpR6LO4vC/QnYbtZvO9mYIgqObrIvDweZ2XCPv+NjSumw3nOFpLQONp0xfZVB xSXu4/UMp1E4OzosPamj/mgLe6K2xrJsQLIE/ROCt9KifQoOiQQv52U/3gAw0c99XSVeKWU 7Vr86uG+WVYfZ+z7+O4CQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:/sIqOr2R5mM=:Pa7Z6GzzqsG48g+NvgDRBf le4/8g4Llr6TzN6BwEafmkUgjtPd7HGrApQj6SjRWOaaaqauP9U/Wcf1sHajlECcx2XUj2fDw MuKmxbDzcg04R7YyFlNzbWPwd4EriRcEVz9iP4ZwUA5JJXyuf3v+nSl9GMH8MTw0ESSeEa/e1 hsFETgHpH+HMefPF2d0hm0tdKx1nVL5sA/+RFQav1sECrcHbIr0gG2ukE2ueCTcjg6SqJbyeY EprTyDktkLMYHPzQmrVoSN5pGgtBtA0PxgbjFje2bSHMFYMoSqJJOz0QRR/SLyW4Zqek5euQY pKNqddcR/W9DxNTMTFBn4AgZjppUz1vJjx3Js05uoM/VVTtvtuT6VX73ylGBAjJ7HOOEhrVxw Kaaz0iMRYXEFlS0aCGiCRVV5bwkK9UreLBO5T9Uiq+k9Wpi9bfXoI6iU5MvhTy4/7sqoDj9Cw 7r3Y2bCOnBjOKuocJftKt4b7mi61WOLArHnsGdNVFTvY9FriHgpsIFFTAGUf8JIfRI6JXWHAc xNTDQwK/KAFZiSW/3YQnMDGxe4GXhGwXpzW2r7lj3CM+iexMBKVRXbToZmTVGc8ztpg7fiUJk bel+A/nxi0ojIMXolgAA7ibJuOB4hu3BTsBCBHeW7hKXYG3GGtyKHPtTxf9j6Eo9qYpSqQG0V ioivWTzGNH/twsLYp4F/GXjTlr1GyBI7kZ0RNZ7COUmwoNJCLSdd3u/298CxaYoQE1QaCZpAu YO4Bl59Iib4dM6sPrwYPif9RTVCNCytMtHZPEHcKVeFO+9PMlPlGpPhTOu+hKlnNbeNYsZeJT kqvxerrnN+RVY3lk/fd4Cn5RN1j7xeM0wkXaTT4IAELFqiFmkI= Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Making module name conflicts a fatal error breaks sparc64 allmodconfig: Error log: error: the following would cause module name conflict: drivers/char/adi.ko drivers/input/joystick/adi.ko Renaming one of the modules would solve the problem, but then cause other problems because neither of them is automatically loaded and changing the name is likely to break any setup that relies on manually loading it by name. As there is probably no sparc64 system with this kind of ancient joystick attached, work around it by adding a Kconfig dependency that forbids them from both being modules. It is still possible to build the joystick driver if the sparc64 adi driver is built-in. Reported-by: Guenter Roeck Acked-by: Greg Kroah-Hartman Cc: Masahiro Yamada Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Arnd Bergmann --- This should get merged through the kbuild tree together with the patch that turns the warning into an error, if the joystick maintainers are ok with the hack. --- drivers/input/joystick/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.26.2 Reviewed-by: Guenter Roeck diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig index 940b744639c7..6f73f02059b5 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -45,6 +45,7 @@ config JOYSTICK_A3D config JOYSTICK_ADI tristate "Logitech ADI digital joysticks and gamepads" select GAMEPORT + depends on ADI!=m # avoid module name conflict help Say Y here if you have a Logitech controller using the ADI protocol over the PC gameport.