From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752243AbcFCAkX (ORCPT ); Thu, 2 Jun 2016 20:40:23 -0400 Received: from mail.windriver.com ([147.11.1.11]:53847 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbcFCAkU (ORCPT ); Thu, 2 Jun 2016 20:40:20 -0400 From: Paul Gortmaker To: linux-kernel@vger.kernel.org, Lee Jones , Kyungmin Park , Javier Martinez Canillas Cc: Paul Gortmaker , Samuel Ortiz , Haojian Zhuang Subject: [PATCH 1/5] mfd: max8925-i2c: Make it explicitly non-modular Date: Thu, 2 Jun 2016 20:39:46 -0400 Message-Id: <1464914390-23520-2-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1464914390-23520-1-git-send-email-paul.gortmaker@windriver.com> References: <1464914390-23520-1-git-send-email-paul.gortmaker@windriver.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig: config MFD_MAX8925 drivers/mfd/Kconfig: bool "Maxim Semiconductor MAX8925 PMIC Support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init was not in use by this code, the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Cc: Samuel Ortiz Cc: Lee Jones Cc: Haojian Zhuang Signed-off-by: Paul Gortmaker --- drivers/mfd/max8925-i2c.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c index 70443b161a5b..5c80aea3211f 100644 --- a/drivers/mfd/max8925-i2c.c +++ b/drivers/mfd/max8925-i2c.c @@ -9,7 +9,7 @@ * published by the Free Software Foundation. */ #include -#include +#include #include #include #include @@ -133,7 +133,6 @@ static const struct i2c_device_id max8925_id_table[] = { { "max8925", 0 }, { }, }; -MODULE_DEVICE_TABLE(i2c, max8925_id_table); static int max8925_dt_init(struct device_node *np, struct device *dev, struct max8925_platform_data *pdata) @@ -240,7 +239,6 @@ static const struct of_device_id max8925_dt_ids[] = { { .compatible = "maxim,max8925", }, {}, }; -MODULE_DEVICE_TABLE(of, max8925_dt_ids); static struct i2c_driver max8925_driver = { .driver = { @@ -264,13 +262,3 @@ static int __init max8925_i2c_init(void) return ret; } subsys_initcall(max8925_i2c_init); - -static void __exit max8925_i2c_exit(void) -{ - i2c_del_driver(&max8925_driver); -} -module_exit(max8925_i2c_exit); - -MODULE_DESCRIPTION("I2C Driver for Maxim 8925"); -MODULE_AUTHOR("Haojian Zhuang "); -MODULE_LICENSE("GPL"); -- 2.4.3