From patchwork Sat Jul 2 23:13:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 9211107 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CBE4160890 for ; Sat, 2 Jul 2016 23:18:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0C34285A8 for ; Sat, 2 Jul 2016 23:18:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5CD3285AF; Sat, 2 Jul 2016 23:18:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42428285AC for ; Sat, 2 Jul 2016 23:18:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752663AbcGBXO3 (ORCPT ); Sat, 2 Jul 2016 19:14:29 -0400 Received: from mail1.windriver.com ([147.11.146.13]:49761 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576AbcGBXOO (ORCPT ); Sat, 2 Jul 2016 19:14:14 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id u62NE4hu005970 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Sat, 2 Jul 2016 16:14:04 -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; Sat, 2 Jul 2016 16:14:03 -0700 From: Paul Gortmaker To: CC: Paul Gortmaker , Niklas Cassel , Jesper Nilsson , Bjorn Helgaas , Subject: [PATCH 02/14] PCI: artpec6: make it explicitly non-modular Date: Sat, 2 Jul 2016 19:13:22 -0400 Message-ID: <20160702231334.26684-3-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20160702231334.26684-1-paul.gortmaker@windriver.com> References: <20160702231334.26684-1-paul.gortmaker@windriver.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Kconfig currently controlling compilation of this code is: drivers/pci/host/Kconfig:config PCIE_ARTPEC6 drivers/pci/host/Kconfig: bool "Axis ARTPEC-6 PCIe controller" ...meaning that it currently is not being built as a module by anyone. Lets remove the few trace uses of modular code and macros, so that when reading the driver there is no doubt it is builtin-only. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. Cc: Niklas Cassel Cc: Jesper Nilsson Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/pci/host/pcie-artpec6.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/pci/host/pcie-artpec6.c b/drivers/pci/host/pcie-artpec6.c index be54fad4698b..73d4e8cb020b 100644 --- a/drivers/pci/host/pcie-artpec6.c +++ b/drivers/pci/host/pcie-artpec6.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -267,7 +267,6 @@ static const struct of_device_id artpec6_pcie_of_match[] = { { .compatible = "axis,artpec6-pcie", }, {}, }; -MODULE_DEVICE_TABLE(of, artpec6_pcie_of_match); static struct platform_driver artpec6_pcie_driver = { .probe = artpec6_pcie_probe, @@ -276,9 +275,4 @@ static struct platform_driver artpec6_pcie_driver = { .of_match_table = artpec6_pcie_of_match, }, }; - -module_platform_driver(artpec6_pcie_driver); - -MODULE_AUTHOR("Niklas Cassel "); -MODULE_DESCRIPTION("Axis ARTPEC-6 PCIe host controller driver"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(artpec6_pcie_driver);