Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751295AbdFCNE0 (ORCPT ); Sat, 3 Jun 2017 09:04:26 -0400 Received: from mail1.windriver.com ([147.11.146.13]:43865 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750997AbdFCNEY (ORCPT ); Sat, 3 Jun 2017 09:04:24 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Support Opensource , Lee Jones , David Dajun Chen Subject: [PATCH 4/4] mfd: da9055-i2c: Make it explicitly non-modular Date: Sat, 3 Jun 2017 09:03:51 -0400 Message-ID: <20170603130351.13913-5-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170603130351.13913-1-paul.gortmaker@windriver.com> References: <20170603130351.13913-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 Content-Length: 2846 Lines: 96 The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_DA9055 drivers/mfd/Kconfig: bool "Dialog Semiconductor DA9055 PMIC Support" ...meaning that it is never being built as a module. Remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. 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: Support Opensource Cc: Lee Jones Cc: David Dajun Chen Signed-off-by: Paul Gortmaker --- drivers/mfd/da9055-i2c.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c index b53e100f577c..7c66f82522f0 100644 --- a/drivers/mfd/da9055-i2c.c +++ b/drivers/mfd/da9055-i2c.c @@ -11,7 +11,7 @@ * */ -#include +#include #include #include #include @@ -46,15 +46,6 @@ static int da9055_i2c_probe(struct i2c_client *i2c, return da9055_device_init(da9055); } -static int da9055_i2c_remove(struct i2c_client *i2c) -{ - struct da9055 *da9055 = i2c_get_clientdata(i2c); - - da9055_device_exit(da9055); - - return 0; -} - /* * DO NOT change the device Ids. The naming is intentionally specific as both * the PMIC and CODEC parts of this chip are instantiated separately as I2C @@ -66,7 +57,6 @@ static struct i2c_device_id da9055_i2c_id[] = { {"da9055-pmic", 0}, { } }; -MODULE_DEVICE_TABLE(i2c, da9055_i2c_id); static const struct of_device_id da9055_of_match[] = { { .compatible = "dlg,da9055-pmic", }, @@ -75,11 +65,11 @@ static const struct of_device_id da9055_of_match[] = { static struct i2c_driver da9055_i2c_driver = { .probe = da9055_i2c_probe, - .remove = da9055_i2c_remove, .id_table = da9055_i2c_id, .driver = { .name = "da9055-pmic", .of_match_table = of_match_ptr(da9055_of_match), + .suppress_bind_attrs = true, }, }; @@ -96,13 +86,3 @@ static int __init da9055_i2c_init(void) return 0; } subsys_initcall(da9055_i2c_init); - -static void __exit da9055_i2c_exit(void) -{ - i2c_del_driver(&da9055_i2c_driver); -} -module_exit(da9055_i2c_exit); - -MODULE_AUTHOR("David Dajun Chen "); -MODULE_DESCRIPTION("I2C driver for Dialog DA9055 PMIC"); -MODULE_LICENSE("GPL"); -- 2.11.0