From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19D69C43603 for ; Wed, 18 Dec 2019 20:49:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9FCD2176D for ; Wed, 18 Dec 2019 20:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727814AbfLRUt4 (ORCPT ); Wed, 18 Dec 2019 15:49:56 -0500 Received: from mail.windriver.com ([147.11.1.11]:47848 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727395AbfLRUtV (ORCPT ); Wed, 18 Dec 2019 15:49:21 -0500 Received: from yow-cube1.wrs.com (yow-cube1.wrs.com [128.224.56.98]) by mail.windriver.com (8.15.2/8.15.2) with ESMTP id xBIKn0ic000214; Wed, 18 Dec 2019 12:49:13 -0800 (PST) From: Paul Gortmaker To: Lee Jones Cc: linux-kernel@vger.kernel.org, Paul Gortmaker , Tony Lindgren , Misael Lopez Cruz , Jorge Eduardo Candelaria , linux-omap@vger.kernel.org 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> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576702137-25905-1-git-send-email-paul.gortmaker@windriver.com> References: <1576702137-25905-1-git-send-email-paul.gortmaker@windriver.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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