linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
	<linux-pci@vger.kernel.org>
Subject: [PATCH 01/14] PCI: armada8k: make it explicitly non-modular
Date: Sat, 2 Jul 2016 19:13:21 -0400	[thread overview]
Message-ID: <20160702231334.26684-2-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20160702231334.26684-1-paul.gortmaker@windriver.com>

The Kconfig currently controlling compilation of this code is:

drivers/pci/host/Kconfig:config PCIE_ARMADA_8K
drivers/pci/host/Kconfig:       bool "Marvell Armada-8K 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.

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: Bjorn Helgaas <bhelgaas@google.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/pci/host/pcie-armada8k.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/host/pcie-armada8k.c b/drivers/pci/host/pcie-armada8k.c
index 55723567b5d4..0f4f570068e3 100644
--- a/drivers/pci/host/pcie-armada8k.c
+++ b/drivers/pci/host/pcie-armada8k.c
@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
+ * Author: Yehuda Yitshak <yehuday@marvell.com>
+ * Author: Shadi Ammouri <shadi@marvell.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.
@@ -14,7 +17,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/pci.h>
 #include <linux/phy/phy.h>
@@ -244,7 +247,6 @@ static const struct of_device_id armada8k_pcie_of_match[] = {
 	{ .compatible = "marvell,armada8k-pcie", },
 	{},
 };
-MODULE_DEVICE_TABLE(of, armada8k_pcie_of_match);
 
 static struct platform_driver armada8k_pcie_driver = {
 	.probe		= armada8k_pcie_probe,
@@ -253,10 +255,4 @@ static struct platform_driver armada8k_pcie_driver = {
 		.of_match_table = of_match_ptr(armada8k_pcie_of_match),
 	},
 };
-
-module_platform_driver(armada8k_pcie_driver);
-
-MODULE_DESCRIPTION("Armada 8k PCIe host controller driver");
-MODULE_AUTHOR("Yehuda Yitshak <yehuday@marvell.com>");
-MODULE_AUTHOR("Shadi Ammouri <shadi@marvell.com>");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(armada8k_pcie_driver);
-- 
2.8.4


  reply	other threads:[~2016-07-02 23:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-02 23:13 [PATCH 00/14] PCI: trivial demodularization of builtin code Paul Gortmaker
2016-07-02 23:13 ` Paul Gortmaker [this message]
2016-07-02 23:13 ` [PATCH 02/14] PCI: artpec6: make it explicitly non-modular Paul Gortmaker
2016-07-02 23:13 ` [PATCH 03/14] PCI: designware-plat: " Paul Gortmaker
2016-07-04  9:09   ` Joao Pinto
2016-07-02 23:13 ` [PATCH 04/14] PCI: generic: " Paul Gortmaker
2016-07-04 17:37   ` Will Deacon
2016-07-05 20:19     ` David Daney
2016-07-06 17:02   ` Will Deacon
2016-07-06 17:39     ` Paul Gortmaker
2016-07-02 23:13 ` [PATCH 05/14] PCI: hisi: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 06/14] PCI: keystone: " Paul Gortmaker
2016-07-06 19:28   ` Murali Karicheri
2016-07-02 23:13 ` [PATCH 07/14] PCI: layerscape: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 08/14] PCI: mvebu: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 09/14] PCI: rcar: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 10/14] PCI: rcar-gen2: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 11/14] PCI: tegra: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 12/14] PCI: thunder-ecam: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 13/14] PCI: thunder-pem: " Paul Gortmaker
2016-07-02 23:13 ` [PATCH 14/14] PCI: xgene: " Paul Gortmaker
     [not found]   ` <CACoXjc=Tw2a_oCvxTmZY+7jeyyb9XvLF1yWx9FEPWekPBaAw1g@mail.gmail.com>
     [not found]     ` <CADaLNDm4L=Zvd6izcMbCZ1jnFO2ix3Oxybp2A4oi+LdxaY1jzA@mail.gmail.com>
2016-07-09 23:15       ` Paul Gortmaker
2016-07-22 21:52 ` [PATCH 00/14] PCI: trivial demodularization of builtin code 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=20160702231334.26684-2-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=bhelgaas@google.com \
    --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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).