From: Paul Gortmaker <paul.gortmaker@windriver.com> To: <linux-kernel@vger.kernel.org> Cc: "Paul Gortmaker" <paul.gortmaker@windriver.com>, "Bjorn Helgaas" <bhelgaas@google.com>, "Michal Simek" <michal.simek@xilinx.com>, "Sören Brinkmann" <soren.brinkmann@xilinx.com>, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/10] drivers/pci: make host/pcie-xilinx.c explicitly non-modular Date: Sat, 12 Dec 2015 20:41:55 -0500 [thread overview] Message-ID: <1449970917-12633-9-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 PCIE_XILINX drivers/pci/host/Kconfig: bool "Xilinx AXI PCIe host bridge 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. This makes xilinx_pcie_free_irq_domain orphaned so we remove it too. We don't have to worry about disallowing a driver unbind, since this driver already does that. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. 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: Bjorn Helgaas <bhelgaas@google.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.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/pcie-xilinx.c | 53 ++---------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index 3c7a0d580b1e..73b5e856f9c2 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c @@ -18,7 +18,7 @@ #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/msi.h> #include <linux/of_address.h> #include <linux/of_pci.h> @@ -516,35 +516,6 @@ static irqreturn_t xilinx_pcie_intr_handler(int irq, void *data) } /** - * xilinx_pcie_free_irq_domain - Free IRQ domain - * @port: PCIe port information - */ -static void xilinx_pcie_free_irq_domain(struct xilinx_pcie_port *port) -{ - int i; - u32 irq, num_irqs; - - /* Free IRQ Domain */ - if (IS_ENABLED(CONFIG_PCI_MSI)) { - - free_pages(port->msi_pages, 0); - - num_irqs = XILINX_NUM_MSI_IRQS; - } else { - /* INTx */ - num_irqs = 4; - } - - for (i = 0; i < num_irqs; i++) { - irq = irq_find_mapping(port->irq_domain, i); - if (irq > 0) - irq_dispose_mapping(irq); - } - - irq_domain_remove(port->irq_domain); -} - -/** * xilinx_pcie_init_irq_domain - Initialize IRQ domain * @port: PCIe port information * @@ -858,21 +829,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev) return 0; } -/** - * xilinx_pcie_remove - Remove function - * @pdev: Platform device pointer - * - * Return: '0' always - */ -static int xilinx_pcie_remove(struct platform_device *pdev) -{ - struct xilinx_pcie_port *port = platform_get_drvdata(pdev); - - xilinx_pcie_free_irq_domain(port); - - return 0; -} - static struct of_device_id xilinx_pcie_of_match[] = { { .compatible = "xlnx,axi-pcie-host-1.00.a", }, {} @@ -885,10 +841,5 @@ static struct platform_driver xilinx_pcie_driver = { .suppress_bind_attrs = true, }, .probe = xilinx_pcie_probe, - .remove = xilinx_pcie_remove, }; -module_platform_driver(xilinx_pcie_driver); - -MODULE_AUTHOR("Xilinx Inc"); -MODULE_DESCRIPTION("Xilinx AXI PCIe driver"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(xilinx_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 08/10] drivers/pci: make host/pcie-xilinx.c explicitly non-modular Date: Sat, 12 Dec 2015 20:41:55 -0500 [thread overview] Message-ID: <1449970917-12633-9-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 PCIE_XILINX drivers/pci/host/Kconfig: bool "Xilinx AXI PCIe host bridge 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. This makes xilinx_pcie_free_irq_domain orphaned so we remove it too. We don't have to worry about disallowing a driver unbind, since this driver already does that. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. 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: Bjorn Helgaas <bhelgaas@google.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: "S?ren Brinkmann" <soren.brinkmann@xilinx.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/pcie-xilinx.c | 53 ++---------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index 3c7a0d580b1e..73b5e856f9c2 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c @@ -18,7 +18,7 @@ #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/msi.h> #include <linux/of_address.h> #include <linux/of_pci.h> @@ -516,35 +516,6 @@ static irqreturn_t xilinx_pcie_intr_handler(int irq, void *data) } /** - * xilinx_pcie_free_irq_domain - Free IRQ domain - * @port: PCIe port information - */ -static void xilinx_pcie_free_irq_domain(struct xilinx_pcie_port *port) -{ - int i; - u32 irq, num_irqs; - - /* Free IRQ Domain */ - if (IS_ENABLED(CONFIG_PCI_MSI)) { - - free_pages(port->msi_pages, 0); - - num_irqs = XILINX_NUM_MSI_IRQS; - } else { - /* INTx */ - num_irqs = 4; - } - - for (i = 0; i < num_irqs; i++) { - irq = irq_find_mapping(port->irq_domain, i); - if (irq > 0) - irq_dispose_mapping(irq); - } - - irq_domain_remove(port->irq_domain); -} - -/** * xilinx_pcie_init_irq_domain - Initialize IRQ domain * @port: PCIe port information * @@ -858,21 +829,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev) return 0; } -/** - * xilinx_pcie_remove - Remove function - * @pdev: Platform device pointer - * - * Return: '0' always - */ -static int xilinx_pcie_remove(struct platform_device *pdev) -{ - struct xilinx_pcie_port *port = platform_get_drvdata(pdev); - - xilinx_pcie_free_irq_domain(port); - - return 0; -} - static struct of_device_id xilinx_pcie_of_match[] = { { .compatible = "xlnx,axi-pcie-host-1.00.a", }, {} @@ -885,10 +841,5 @@ static struct platform_driver xilinx_pcie_driver = { .suppress_bind_attrs = true, }, .probe = xilinx_pcie_probe, - .remove = xilinx_pcie_remove, }; -module_platform_driver(xilinx_pcie_driver); - -MODULE_AUTHOR("Xilinx Inc"); -MODULE_DESCRIPTION("Xilinx AXI PCIe driver"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(xilinx_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 ` [PATCH 03/10] drivers/pci: make host/pci-mvebu.c " Paul Gortmaker 2015-12-13 1:41 ` 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 ` Paul Gortmaker [this message] 2015-12-13 1:41 ` [PATCH 08/10] drivers/pci: make host/pcie-xilinx.c " 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-9-git-send-email-paul.gortmaker@windriver.com \ --to=paul.gortmaker@windriver.com \ --cc=bhelgaas@google.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=michal.simek@xilinx.com \ --cc=soren.brinkmann@xilinx.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.