Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1104387imu; Thu, 22 Nov 2018 10:09:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xu/oFKPLtBt2Wq1A5yiuFJ8/tTaR2J/S6UjVymsZUWpz9x3DSVjdWCliOj9xwrpYKLhODR X-Received: by 2002:a63:e615:: with SMTP id g21mr11119236pgh.290.1542910142126; Thu, 22 Nov 2018 10:09:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542910142; cv=none; d=google.com; s=arc-20160816; b=L5MeTOdsSuN/HkFzEQ0AdUGSKX3kkb7q2ZdhXfZ0qNc3/sUCsvDsUJhV/vk6Wv5dlb 3hHz34dh1QkrbrWE9Cnon7yi/dNpB4X6CCVj8QtUe0neKEeWdjp4IMuwOJyO0z60Bn78 89duCWZuN76wo8ttxlpB10fg27VbzlR4vsdYk9+WY1OPIHj0MGYpYC9+TtKxt871wtLH qMGHChj4cq8PscX7y+tbvQ+9hOntuoy5yZpryw1It7lDsK73DO4yPqdd5CloThIvlTGk kN3odpLsZhmAkJt7/cQCBRFUrF88+zzE/SQtbI5qGLHmQDPqIfhhPh2YRkGZHGup9pUu R8XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=GWOMSOjVY9gUrtsuk7+815AZyHN1uliDToTbuHfnnVk=; b=wqwbZnKXjBUZSb3Ga/ach8Il/TTH2SzeL///eUCbQ7IRj73dtwxbWC1i6hkdO6J20c PuhOxqiKId+wxKBNA7xyPDYx8SzVeu1fNm1LTt1rxJfW0qq25xd78oojtI1lxy3bl2vo 2Tq+Cr2aaS3U2CUH5hjoZ/QX1s4KqQlRBRFC8ztem4wVTjYXlP9SUPcPONPZUH9CLBFA xNkSDUUa7QOvcmUgwGaFGdRN93jcGY5Y2JBYvwu2S/AANHlcixOo3CF5CtNisq4m6JYs LWkh4mhDbWXy/3Wn/YWZqAw+eT0I/POWeX8+PQSjrPDE1FR336iZ7e98wy1ZR+Lz/uuL Q49w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y188si36100477pfb.59.2018.11.22.10.08.46; Thu, 22 Nov 2018 10:09:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392045AbeKVPPC (ORCPT + 99 others); Thu, 22 Nov 2018 10:15:02 -0500 Received: from mail5.windriver.com ([192.103.53.11]:53124 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727787AbeKVPPC (ORCPT ); Thu, 22 Nov 2018 10:15:02 -0500 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id wAM4aTTO012283 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 21 Nov 2018 20:36:45 -0800 Received: from yow-cube1.wrs.com (128.224.56.98) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.408.0; Wed, 21 Nov 2018 20:36:19 -0800 From: Paul Gortmaker To: Lee Jones CC: , Paul Gortmaker , Subject: [PATCH 11/11] mfd: wm8400-core: Make it explicitly non-modular Date: Wed, 21 Nov 2018 23:32:59 -0500 Message-ID: <1542861179-8941-12-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542861179-8941-1-git-send-email-paul.gortmaker@windriver.com> References: <1542861179-8941-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_WM8400 drivers/mfd/Kconfig: bool "Wolfson Microelectronics WM8400" ...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. Finally a function is renamed to remove word "module" in order to possibly remove any confusion. Cc: Lee Jones Cc: patches@opensource.cirrus.com Signed-off-by: Paul Gortmaker --- drivers/mfd/wm8400-core.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index 8a98a2fc74e1..79756c83f5f0 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c @@ -12,7 +12,7 @@ * */ -#include +#include #include #include #include @@ -150,7 +150,6 @@ static const struct i2c_device_id wm8400_i2c_id[] = { { "wm8400", 0 }, { } }; -MODULE_DEVICE_TABLE(i2c, wm8400_i2c_id); static struct i2c_driver wm8400_i2c_driver = { .driver = { @@ -161,7 +160,7 @@ static struct i2c_driver wm8400_i2c_driver = { }; #endif -static int __init wm8400_module_init(void) +static int __init wm8400_driver_init(void) { int ret = -ENODEV; @@ -173,15 +172,4 @@ static int __init wm8400_module_init(void) return ret; } -subsys_initcall(wm8400_module_init); - -static void __exit wm8400_module_exit(void) -{ -#if IS_ENABLED(CONFIG_I2C) - i2c_del_driver(&wm8400_i2c_driver); -#endif -} -module_exit(wm8400_module_exit); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mark Brown "); +subsys_initcall(wm8400_driver_init); -- 2.7.4