Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965787AbbKEXg2 (ORCPT ); Thu, 5 Nov 2015 18:36:28 -0500 Received: from us-mx2.synaptics.com ([192.147.44.131]:43081 "EHLO us-mx1.synaptics.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965377AbbKEXg1 (ORCPT ); Thu, 5 Nov 2015 18:36:27 -0500 X-PGP-Universal: processed; by securemail.synaptics.com on Thu, 05 Nov 2015 16:36:50 -0800 From: Andrew Duggan To: , CC: Benjamin Tissoires , Dmitry Torokhov , Linus Walleij , Benjamin Tissoires , Christopher Heiny , Stephen Chandler Paul Subject: [PATCH 01/26] Input: synaptics-rmi4 - embed the function modules in rmi_core Date: Thu, 5 Nov 2015 15:36:18 -0800 Message-ID: <1446766578-30160-1-git-send-email-aduggan@synaptics.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.4.10.145] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4557 Lines: 141 From: Benjamin Tissoires the function modules can not be auto-loaded by udev. So at boot, the functions are not there and the device is not properly populated. Force the functions to be embedded in rmi_core so that when the touchpad is there, the functions are there too. There is not much use of having the functions separate anyway Signed-off-by: Benjamin Tissoires Tested-by: Andrew Duggan --- drivers/input/rmi4/Kconfig | 5 +---- drivers/input/rmi4/Makefile | 2 +- drivers/input/rmi4/rmi_bus.c | 12 +++++++++++- drivers/input/rmi4/rmi_driver.h | 8 ++++++++ drivers/input/rmi4/rmi_f11.c | 14 ++++++++------ 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig index d0c7b6e..5e3890e 100644 --- a/drivers/input/rmi4/Kconfig +++ b/drivers/input/rmi4/Kconfig @@ -37,7 +37,7 @@ config RMI4_I2C This feature is not currently available as a loadable module. config RMI4_F11 - tristate "RMI4 Function 11 (2D pointing)" + bool "RMI4 Function 11 (2D pointing)" depends on RMI4_CORE help Say Y here if you want to add support for RMI4 function 11. @@ -46,9 +46,6 @@ config RMI4_F11 touchpads. For sensors that support relative pointing, F11 also provides mouse input. - To compile this driver as a module, choose M here: the - module will be called rmi-f11. - config RMI4_F11_PEN bool "RMI4 F11 Pen Support" depends on RMI4_F11 diff --git a/drivers/input/rmi4/Makefile b/drivers/input/rmi4/Makefile index 5c6bad5..63bc595 100644 --- a/drivers/input/rmi4/Makefile +++ b/drivers/input/rmi4/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_RMI4_CORE) += rmi_core.o rmi_core-y := rmi_bus.o rmi_driver.o rmi_f01.o # Function drivers -obj-$(CONFIG_RMI4_F11) += rmi_f11.o +rmi_core-$(CONFIG_RMI4_F11) += rmi_f11.o # Transports obj-$(CONFIG_RMI4_I2C) += rmi_i2c.o diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c index 6e0454a..bbc80e6 100644 --- a/drivers/input/rmi4/rmi_bus.c +++ b/drivers/input/rmi4/rmi_bus.c @@ -383,15 +383,24 @@ static int __init rmi_bus_init(void) goto err_unregister_bus; } + error = rmi_register_f11_handler(); + if (error) { + pr_err("%s: error registering the RMI F11 handler: %d\n", + __func__, error); + goto err_unregister_f01; + } + error = rmi_register_physical_driver(); if (error) { pr_err("%s: error registering the RMI physical driver: %d\n", __func__, error); - goto err_unregister_f01; + goto err_unregister_f11; } return 0; +err_unregister_f11: + rmi_unregister_f11_handler(); err_unregister_f01: rmi_unregister_f01_handler(); err_unregister_bus: @@ -409,6 +418,7 @@ static void __exit rmi_bus_exit(void) */ rmi_unregister_physical_driver(); + rmi_unregister_f11_handler(); rmi_unregister_f01_handler(); rmi_bus_teardown_debugfs(); bus_unregister(&rmi_bus_type); diff --git a/drivers/input/rmi4/rmi_driver.h b/drivers/input/rmi4/rmi_driver.h index 34f7a7d..dda564f 100644 --- a/drivers/input/rmi4/rmi_driver.h +++ b/drivers/input/rmi4/rmi_driver.h @@ -113,4 +113,12 @@ void rmi_unregister_physical_driver(void); int rmi_register_f01_handler(void); void rmi_unregister_f01_handler(void); +#ifdef CONFIG_RMI4_F11 +int rmi_register_f11_handler(void); +void rmi_unregister_f11_handler(void); +#else +static inline int rmi_register_f11_handler(void) { return 0; } +static inline void rmi_unregister_f11_handler(void) {} +#endif + #endif diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c index 7af4f68..2e1d506 100644 --- a/drivers/input/rmi4/rmi_f11.c +++ b/drivers/input/rmi4/rmi_f11.c @@ -1537,10 +1537,12 @@ static struct rmi_function_handler rmi_f11_handler = { .attention = rmi_f11_attention, }; -module_rmi_driver(rmi_f11_handler); +int __init rmi_register_f11_handler(void) +{ + return rmi_register_function_handler(&rmi_f11_handler); +} -MODULE_AUTHOR("Christopher Heiny