From: Paul Gortmaker Subject: [PATCH 10/18] mfd: twl6040: Make it explicitly non-modular Date: Wed, 18 Dec 2019 15:48:49 -0500 Message-ID: <1576702137-25905-11-git-send-email-paul.gortmaker@windriver.com> References: <1576702137-25905-1-git-send-email-paul.gortmaker@windriver.com> Return-path: In-Reply-To: <1576702137-25905-1-git-send-email-paul.gortmaker@windriver.com> Sender: linux-kernel-owner@vger.kernel.org To: Lee Jones Cc: linux-kernel@vger.kernel.org, Paul Gortmaker , Tony Lindgren , Misael Lopez Cruz , Jorge Eduardo Candelaria , linux-omap@vger.kernel.org List-Id: linux-omap@vger.kernel.org The Kconfig/Makefile controlling compilation of this code is: drivers/mfd/Kconfig:config TWL6040_CORE drivers/mfd/Kconfig: bool "TI TWL6040 audio codec" drivers/mfd/Makefile: obj-$(CONFIG_TWL6040_CORE) += twl6040.o ...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. 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_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: Tony Lindgren Cc: Lee Jones Cc: Misael Lopez Cruz Cc: Jorge Eduardo Candelaria Cc: linux-omap@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/mfd/twl6040.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index b9c6d94b4002..531eefb2fab5 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c @@ -9,7 +9,7 @@ * Copyright: (C) 2011 Texas Instruments, Inc. */ -#include +#include #include #include #include @@ -808,41 +808,18 @@ static int twl6040_probe(struct i2c_client *client, return ret; } -static int twl6040_remove(struct i2c_client *client) -{ - struct twl6040 *twl6040 = i2c_get_clientdata(client); - - if (twl6040->power_count) - twl6040_power(twl6040, 0); - - regmap_del_irq_chip(twl6040->irq, twl6040->irq_data); - - mfd_remove_devices(&client->dev); - - regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies); - - return 0; -} - static const struct i2c_device_id twl6040_i2c_id[] = { { "twl6040", 0, }, { "twl6041", 0, }, { }, }; -MODULE_DEVICE_TABLE(i2c, twl6040_i2c_id); static struct i2c_driver twl6040_driver = { .driver = { .name = "twl6040", + .suppress_bind_attrs = true, }, .probe = twl6040_probe, - .remove = twl6040_remove, .id_table = twl6040_i2c_id, }; - -module_i2c_driver(twl6040_driver); - -MODULE_DESCRIPTION("TWL6040 MFD"); -MODULE_AUTHOR("Misael Lopez Cruz "); -MODULE_AUTHOR("Jorge Eduardo Candelaria "); -MODULE_LICENSE("GPL"); +builtin_i2c_driver(twl6040_driver); -- 2.7.4