From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Date: Tue, 22 Dec 2015 00:59:09 +0000 Subject: [PATCH 2/2] drivers/pci: make host/pci-rcar-gen2.c explicitly non-modular Message-Id: <1450745949-23882-3-git-send-email-paul.gortmaker@windriver.com> List-Id: References: <1450745949-23882-1-git-send-email-paul.gortmaker@windriver.com> In-Reply-To: <1450745949-23882-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org Cc: Paul Gortmaker , Simon Horman , Bjorn Helgaas , Phil Edworthy , Valentine Barshak , linux-pci@vger.kernel.org, linux-sh@vger.kernel.org The Kconfig currently controlling compilation of this code is: drivers/pci/host/Kconfig:config PCI_RCAR_GEN2 drivers/pci/host/Kconfig: bool "Renesas R-Car Gen2 Internal PCI 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. We don't have to disallow a driver unbind, since that is already done for us in this driver. 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 replace module.h with init.h since the file already has that. 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: Simon Horman Acked-by: Simon Horman Cc: Bjorn Helgaas Cc: Phil Edworthy Cc: Valentine Barshak Acked-by: Phil Edworthy Cc: linux-pci@vger.kernel.org Cc: linux-sh@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/pci/host/pci-rcar-gen2.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index 9980a4bdae7e..8df9c36458e9 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -4,6 +4,8 @@ * Copyright (C) 2013 Renesas Solutions Corp. * Copyright (C) 2013 Cogent Embedded, Inc. * + * Module Author: Valentine Barshak + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -14,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -437,8 +438,6 @@ static struct of_device_id rcar_pci_of_match[] = { { }, }; -MODULE_DEVICE_TABLE(of, rcar_pci_of_match); - static struct platform_driver rcar_pci_driver = { .driver = { .name = "pci-rcar-gen2", @@ -447,9 +446,4 @@ static struct platform_driver rcar_pci_driver = { }, .probe = rcar_pci_probe, }; - -module_platform_driver(rcar_pci_driver); - -MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("Renesas R-Car Gen2 internal PCI"); -MODULE_AUTHOR("Valentine Barshak "); +builtin_platform_driver(rcar_pci_driver); -- 2.6.1