Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866AbdGFJGH (ORCPT ); Thu, 6 Jul 2017 05:06:07 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35642 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970AbdGFJGF (ORCPT ); Thu, 6 Jul 2017 05:06:05 -0400 From: Arvind Yadav To: dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] input: rmi4: Fix redefinition error on compilation. Date: Thu, 6 Jul 2017 14:35:45 +0530 Message-Id: X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1665 Lines: 45 If CONFIG_RMI4_F34 is disable, it'll through compilation error. drivers/input/rmi4/rmi_f34.c:594:5: error: redefinition of ‘rmi_f34_create_sysfs’ int rmi_f34_create_sysfs(struct rmi_device *rmi_dev) ^ In file included from drivers/input/rmi4/rmi_f34.c:17:0: drivers/input/rmi4/rmi_driver.h:127:19: note: previous definition of ‘rmi_f34_create_sysfs’ was here static inline int rmi_f34_create_sysfs(struct rmi_device *rmi_dev) ^ drivers/input/rmi4/rmi_f34.c:599:6: error: redefinition of ‘rmi_f34_remove_sysfs’ void rmi_f34_remove_sysfs(struct rmi_device *rmi_dev) ^ In file included from drivers/input/rmi4/rmi_f34.c:17:0: drivers/input/rmi4/rmi_driver.h:132:20: note: previous definition of ‘rmi_f34_remove_sysfs’ was here static inline void rmi_f34_remove_sysfs(struct rmi_device *rmi_dev) Signed-off-by: Arvind Yadav --- drivers/input/rmi4/rmi_f34.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/rmi4/rmi_f34.c b/drivers/input/rmi4/rmi_f34.c index 4cfe970..0f9b905 100644 --- a/drivers/input/rmi4/rmi_f34.c +++ b/drivers/input/rmi4/rmi_f34.c @@ -590,7 +590,7 @@ static int rmi_f34_probe(struct rmi_function *fn) return 0; } - +#ifdef CONFIG_RMI4_F34 int rmi_f34_create_sysfs(struct rmi_device *rmi_dev) { return sysfs_create_group(&rmi_dev->dev.kobj, &rmi_firmware_attr_group); @@ -600,7 +600,7 @@ void rmi_f34_remove_sysfs(struct rmi_device *rmi_dev) { sysfs_remove_group(&rmi_dev->dev.kobj, &rmi_firmware_attr_group); } - +#endif struct rmi_function_handler rmi_f34_handler = { .driver = { .name = "rmi4_f34", -- 1.9.1