From: Paul Gortmaker <paul.gortmaker@windriver.com> To: <linux-kernel@vger.kernel.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>, Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Jason Cooper <jason@lakedaemon.net>, Bjorn Helgaas <bhelgaas@google.com>, <linux-pci@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org> Subject: [PATCH 03/10] drivers/pci: make host/pci-mvebu.c explicitly non-modular Date: Sat, 12 Dec 2015 20:41:50 -0500 [thread overview] Message-ID: <1449970917-12633-4-git-send-email-paul.gortmaker@windriver.com> (raw) In-Reply-To: <1449970917-12633-1-git-send-email-paul.gortmaker@windriver.com> The Kconfig currently controlling compilation of this code is: drivers/pci/host/Kconfig:config PCI_MVEBU drivers/pci/host/Kconfig: bool "Marvell EBU PCIe controller" ...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_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. We don't have to disallow a driver unbind, since that is already done for us in this driver. 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 was (or is now ) contained at the top of the file in the comments. Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/pci/host/pci-mvebu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 53b79c5f0559..17222f1a3ef3 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -1,6 +1,8 @@ /* * PCIe driver for Marvell Armada 370 and Armada XP SoCs * + * Module Author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. @@ -11,7 +13,7 @@ #include <linux/clk.h> #include <linux/delay.h> #include <linux/gpio.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/mbus.h> #include <linux/msi.h> #include <linux/slab.h> @@ -1296,7 +1298,6 @@ static const struct of_device_id mvebu_pcie_of_match_table[] = { { .compatible = "marvell,kirkwood-pcie", }, {}, }; -MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table); static struct dev_pm_ops mvebu_pcie_pm_ops = { .suspend_noirq = mvebu_pcie_suspend, @@ -1313,8 +1314,4 @@ static struct platform_driver mvebu_pcie_driver = { }, .probe = mvebu_pcie_probe, }; -module_platform_driver(mvebu_pcie_driver); - -MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); -MODULE_DESCRIPTION("Marvell EBU PCIe driver"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(mvebu_pcie_driver); -- 2.6.1
WARNING: multiple messages have this Message-ID (diff)
From: paul.gortmaker@windriver.com (Paul Gortmaker) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/10] drivers/pci: make host/pci-mvebu.c explicitly non-modular Date: Sat, 12 Dec 2015 20:41:50 -0500 [thread overview] Message-ID: <1449970917-12633-4-git-send-email-paul.gortmaker@windriver.com> (raw) In-Reply-To: <1449970917-12633-1-git-send-email-paul.gortmaker@windriver.com> The Kconfig currently controlling compilation of this code is: drivers/pci/host/Kconfig:config PCI_MVEBU drivers/pci/host/Kconfig: bool "Marvell EBU PCIe controller" ...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_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. We don't have to disallow a driver unbind, since that is already done for us in this driver. 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 was (or is now ) contained at the top of the file in the comments. Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: linux-pci at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/pci/host/pci-mvebu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 53b79c5f0559..17222f1a3ef3 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -1,6 +1,8 @@ /* * PCIe driver for Marvell Armada 370 and Armada XP SoCs * + * Module Author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. @@ -11,7 +13,7 @@ #include <linux/clk.h> #include <linux/delay.h> #include <linux/gpio.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/mbus.h> #include <linux/msi.h> #include <linux/slab.h> @@ -1296,7 +1298,6 @@ static const struct of_device_id mvebu_pcie_of_match_table[] = { { .compatible = "marvell,kirkwood-pcie", }, {}, }; -MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table); static struct dev_pm_ops mvebu_pcie_pm_ops = { .suspend_noirq = mvebu_pcie_suspend, @@ -1313,8 +1314,4 @@ static struct platform_driver mvebu_pcie_driver = { }, .probe = mvebu_pcie_probe, }; -module_platform_driver(mvebu_pcie_driver); - -MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); -MODULE_DESCRIPTION("Marvell EBU PCIe driver"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(mvebu_pcie_driver); -- 2.6.1
next prev parent reply other threads:[~2015-12-13 1:43 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-13 1:41 [PATCH 00/10] drivers/pci: avoid module_init in non-modular host/pci* Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-13 1:41 ` [PATCH 01/10] drivers/pci: make host/pci-imx6.c driver explicitly non-modular Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-14 8:52 ` Arnd Bergmann 2015-12-14 8:52 ` Arnd Bergmann 2015-12-13 1:41 ` [PATCH 02/10] drivers/pci: make host/pcie-spear13xx.c " Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker [this message] 2015-12-13 1:41 ` [PATCH 03/10] drivers/pci: make host/pci-mvebu.c " Paul Gortmaker 2015-12-13 10:33 ` Thomas Petazzoni 2015-12-13 10:33 ` Thomas Petazzoni 2015-12-14 8:54 ` Arnd Bergmann 2015-12-14 8:54 ` Arnd Bergmann 2015-12-13 1:41 ` [PATCH 04/10] drivers/pci: make host/pci-dra7xx.c " Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-13 1:41 ` [PATCH 05/10] drivers/pci: make host/pci-rcar-gen2.c " Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-13 10:59 ` Geert Uytterhoeven 2015-12-13 10:59 ` Geert Uytterhoeven 2015-12-13 18:15 ` Paul Gortmaker 2015-12-13 18:15 ` Paul Gortmaker 2015-12-13 20:37 ` Joe Perches 2015-12-13 20:37 ` Joe Perches 2015-12-14 5:19 ` Simon Horman 2015-12-14 5:19 ` Simon Horman 2015-12-13 1:41 ` [PATCH 06/10] drivers/pci: make host/pci-tegra.c " Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-14 8:15 ` Thierry Reding 2015-12-13 1:41 ` [PATCH 07/10] drivers/pci: make host/pcie-rcar.c " Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-13 10:58 ` Geert Uytterhoeven 2015-12-13 10:58 ` Geert Uytterhoeven 2015-12-13 18:20 ` Paul Gortmaker 2015-12-13 18:20 ` Paul Gortmaker 2015-12-17 11:32 ` Phil Edworthy 2015-12-17 11:32 ` Phil Edworthy 2015-12-17 11:32 ` Phil Edworthy 2015-12-17 16:06 ` Paul Gortmaker 2015-12-17 16:06 ` Paul Gortmaker 2015-12-14 5:19 ` Simon Horman 2015-12-14 5:19 ` Simon Horman 2015-12-13 1:41 ` [PATCH 08/10] drivers/pci: make host/pcie-xilinx.c " Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-14 7:25 ` Michal Simek 2015-12-14 7:25 ` Michal Simek 2015-12-13 1:41 ` [PATCH 09/10] drivers/pci: make host/pci-keystone.c " Paul Gortmaker 2015-12-13 1:41 ` Paul Gortmaker 2015-12-13 1:41 ` [PATCH 10/10] drivers/pci: make host/pcie-altera.c " Paul Gortmaker 2015-12-14 8:19 ` [PATCH 00/10] drivers/pci: avoid module_init in non-modular host/pci* Geert Uytterhoeven 2015-12-14 8:19 ` Geert Uytterhoeven 2015-12-14 8:19 ` Geert Uytterhoeven 2015-12-14 8:19 ` Geert Uytterhoeven 2015-12-14 8:24 ` Thierry Reding 2015-12-14 8:24 ` Thierry Reding 2015-12-14 8:24 ` Thierry Reding 2015-12-14 8:24 ` Thierry Reding 2015-12-14 8:26 ` Michal Simek 2015-12-14 8:26 ` Michal Simek 2015-12-14 8:26 ` Michal Simek 2015-12-14 8:26 ` Michal Simek 2015-12-14 8:33 ` Ley Foon Tan 2015-12-14 8:33 ` Ley Foon Tan 2015-12-14 8:33 ` Ley Foon Tan 2015-12-14 8:33 ` Ley Foon Tan 2015-12-14 9:19 ` Thierry Reding 2015-12-14 9:19 ` Thierry Reding 2015-12-14 9:19 ` Thierry Reding 2015-12-14 9:19 ` Thierry Reding 2015-12-14 10:27 ` Arnd Bergmann 2015-12-14 10:27 ` Arnd Bergmann 2015-12-14 10:27 ` Arnd Bergmann 2015-12-14 10:27 ` Arnd Bergmann 2015-12-15 15:16 ` Paul Gortmaker 2015-12-15 15:16 ` Paul Gortmaker 2015-12-15 15:16 ` Paul Gortmaker 2015-12-15 15:16 ` Paul Gortmaker 2016-01-08 20:31 ` Bjorn Helgaas 2016-01-08 20:31 ` Bjorn Helgaas 2016-01-08 20:31 ` Bjorn Helgaas 2016-01-08 20:31 ` Bjorn Helgaas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1449970917-12633-4-git-send-email-paul.gortmaker@windriver.com \ --to=paul.gortmaker@windriver.com \ --cc=bhelgaas@google.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=thomas.petazzoni@free-electrons.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.