From patchwork Sun Mar 27 21:10:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 8676411 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9242DC0553 for ; Sun, 27 Mar 2016 21:13:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEE3720220 for ; Sun, 27 Mar 2016 21:13:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4C682021A for ; Sun, 27 Mar 2016 21:13:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1akHyf-00046s-Jk; Sun, 27 Mar 2016 21:12:05 +0000 Received: from mail.windriver.com ([147.11.1.11]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1akHyP-0003jE-0J for linux-arm-kernel@lists.infradead.org; Sun, 27 Mar 2016 21:11:51 +0000 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id u2RLBKI3012270 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Sun, 27 Mar 2016 14:11:21 -0700 (PDT) Received: from yow-lpgnfs-02.corp.ad.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Sun, 27 Mar 2016 14:11:20 -0700 From: Paul Gortmaker To: Subject: [PATCH 4/4] drivers/bus: make arm-ccn.c driver explicitly non-modular Date: Sun, 27 Mar 2016 17:10:58 -0400 Message-ID: <1459113058-14340-5-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1459113058-14340-1-git-send-email-paul.gortmaker@windriver.com> References: <1459113058-14340-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160327_141149_184268_5BB53410 X-CRM114-Status: GOOD ( 23.12 ) X-Spam-Score: -5.2 (-----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Pawel Moll , Will Deacon , Paul Gortmaker , Olof Johansson , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Kconfig for this driver is currently: config ARM_CCN bool "ARM CCN driver support" ...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_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We exchange module.h for moduleparam.h here since the driver uses module_param_named, and for now the easiest way to remain compatible with existing bootargs use cases is to leave this as-is. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Pawel Moll Cc: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker --- drivers/bus/arm-ccn.c | 41 +++++------------------------------------ 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index 7082c7268845..45d2ba72ba8e 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -9,6 +9,8 @@ * GNU General Public License for more details. * * Copyright (C) 2014 ARM Limited + * + * Author: Pawel Moll */ #include @@ -16,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -1302,20 +1304,6 @@ error_cpu_notifier: return err; } -static void arm_ccn_pmu_cleanup(struct arm_ccn *ccn) -{ - int i; - - irq_set_affinity(ccn->irq, cpu_possible_mask); - unregister_cpu_notifier(&ccn->dt.cpu_nb); - for (i = 0; i < ccn->num_xps; i++) - writel(0, ccn->xp[i].base + CCN_XP_DT_CONTROL); - writel(0, ccn->dt.base + CCN_DT_PMCR); - perf_pmu_unregister(&ccn->dt.pmu); - ida_simple_remove(&arm_ccn_pmu_ida, ccn->dt.id); -} - - static int arm_ccn_for_each_valid_region(struct arm_ccn *ccn, int (*callback)(struct arm_ccn *ccn, int region, void __iomem *base, u32 type, u32 id)) @@ -1507,15 +1495,6 @@ static int arm_ccn_probe(struct platform_device *pdev) return arm_ccn_pmu_init(ccn); } -static int arm_ccn_remove(struct platform_device *pdev) -{ - struct arm_ccn *ccn = platform_get_drvdata(pdev); - - arm_ccn_pmu_cleanup(ccn); - - return 0; -} - static const struct of_device_id arm_ccn_match[] = { { .compatible = "arm,ccn-504", }, {}, @@ -1525,9 +1504,9 @@ static struct platform_driver arm_ccn_driver = { .driver = { .name = "arm-ccn", .of_match_table = arm_ccn_match, + .suppress_bind_attrs = true, }, .probe = arm_ccn_probe, - .remove = arm_ccn_remove, }; static int __init arm_ccn_init(void) @@ -1539,14 +1518,4 @@ static int __init arm_ccn_init(void) return platform_driver_register(&arm_ccn_driver); } - -static void __exit arm_ccn_exit(void) -{ - platform_driver_unregister(&arm_ccn_driver); -} - -module_init(arm_ccn_init); -module_exit(arm_ccn_exit); - -MODULE_AUTHOR("Pawel Moll "); -MODULE_LICENSE("GPL"); +device_initcall(arm_ccn_init);