From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932707AbcGEB0X (ORCPT ); Mon, 4 Jul 2016 21:26:23 -0400 Received: from mail1.windriver.com ([147.11.146.13]:40945 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753908AbcGEB0M (ORCPT ); Mon, 4 Jul 2016 21:26:12 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Samuel Ortiz , Lee Jones , Florian Lobmaier , Laxman Dewangan Subject: [PATCH 2/6] mfd: as3722: Make it explicitly non-modular Date: Mon, 4 Jul 2016 21:25:40 -0400 Message-ID: <20160705012544.14143-3-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20160705012544.14143-1-paul.gortmaker@windriver.com> References: <20160705012544.14143-1-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain 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_AS3722 drivers/mfd/Kconfig: bool "ams AS3722 Power Management IC" ...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_i2c_driver() uses the same init level priority as builtin_i2c_driver() 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: Florian Lobmaier Cc: Laxman Dewangan Signed-off-by: Paul Gortmaker --- drivers/mfd/as3722.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c index f87342c211bc..c8a199d081ce 100644 --- a/drivers/mfd/as3722.c +++ b/drivers/mfd/as3722.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -439,13 +439,11 @@ static const struct of_device_id as3722_of_match[] = { { .compatible = "ams,as3722", }, {}, }; -MODULE_DEVICE_TABLE(of, as3722_of_match); static const struct i2c_device_id as3722_i2c_id[] = { { "as3722", 0 }, {}, }; -MODULE_DEVICE_TABLE(i2c, as3722_i2c_id); static const struct dev_pm_ops as3722_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(as3722_i2c_suspend, as3722_i2c_resume) @@ -460,10 +458,4 @@ static struct i2c_driver as3722_i2c_driver = { .probe = as3722_i2c_probe, .id_table = as3722_i2c_id, }; - -module_i2c_driver(as3722_i2c_driver); - -MODULE_DESCRIPTION("I2C support for AS3722 PMICs"); -MODULE_AUTHOR("Florian Lobmaier "); -MODULE_AUTHOR("Laxman Dewangan "); -MODULE_LICENSE("GPL"); +builtin_i2c_driver(as3722_i2c_driver); -- 2.8.4