Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4589a66 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/demodularize' into next 

* pci/demodularize:
  PCI: pciehp: Make explicitly non-modular
  PCI: hotplug: Make core explicitly non-modular
  PCI: xilinx-nwl: Make explicitly non-modular
  PCI: xilinx: Make explicitly non-modular
  PCI: qcom: Make explicitly non-modular
  PCI: dra7xx: Make explicitly non-modular
  PCI/AER: Make explicitly non-modular
  PCI/PME: Make explicitly non-modular
  PCI: Make DPC explicitly non-modular
  PCI: generic: Make explicitly non-modular
  PCI: exynos: Make explicitly non-modular
  PCI: designware: Make explicitly non-modular
  PCI: spear: Make explicitly non-modular
  PCI: portdrv: Make explicitly non-modular
  PCI: imx6: Make explicitly non-modular
  PCI: altera: Make explicitly non-modular
  PCI: altera: Make MSI explicitly non-modular
parents 29b4817d 70626d88

drivers/pci/host/pci-dra7xx.c

+3 −28
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of_gpio.h>

#include <linux/pci.h>

#include <linux/phy/phy.h>
@@ -443,25 +443,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
	return ret;

}



static int __exit dra7xx_pcie_remove(struct platform_device *pdev)

{

	struct dra7xx_pcie *dra7xx = platform_get_drvdata(pdev);

	struct pcie_port *pp = &dra7xx->pp;

	struct device *dev = &pdev->dev;

	int count = dra7xx->phy_count;



	if (pp->irq_domain)

		irq_domain_remove(pp->irq_domain);

	pm_runtime_put(dev);

	pm_runtime_disable(dev);

	while (count--) {

		phy_power_off(dra7xx->phy[count]);

		phy_exit(dra7xx->phy[count]);

	}



	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int dra7xx_pcie_suspend(struct device *dev)

{
@@ -545,19 +526,13 @@ static const struct of_device_id of_dra7xx_pcie_match[] = { 
	{ .compatible = "ti,dra7-pcie", },

	{},

};

MODULE_DEVICE_TABLE(of, of_dra7xx_pcie_match);



static struct platform_driver dra7xx_pcie_driver = {

	.remove		= __exit_p(dra7xx_pcie_remove),

	.driver = {

		.name	= "dra7-pcie",

		.of_match_table = of_dra7xx_pcie_match,

		.suppress_bind_attrs = true,

		.pm	= &dra7xx_pcie_pm_ops,

	},

};



module_platform_driver_probe(dra7xx_pcie_driver, dra7xx_pcie_probe);



MODULE_AUTHOR("Kishon Vijay Abraham I <kishon@ti.com>");

MODULE_DESCRIPTION("TI PCIe controller driver");

MODULE_LICENSE("GPL v2");
 
builtin_platform_driver_probe(dra7xx_pcie_driver, dra7xx_pcie_probe);

drivers/pci/host/pci-exynos.c

+1 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/gpio.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of_gpio.h>

#include <linux/pci.h>

#include <linux/platform_device.h>
@@ -624,7 +624,6 @@ static const struct of_device_id exynos_pcie_of_match[] = { 
	{ .compatible = "samsung,exynos5440-pcie", },

	{},

};

MODULE_DEVICE_TABLE(of, exynos_pcie_of_match);



static struct platform_driver exynos_pcie_driver = {

	.remove		= __exit_p(exynos_pcie_remove),
@@ -641,7 +640,3 @@ static int __init exynos_pcie_init(void) 
	return platform_driver_probe(&exynos_pcie_driver, exynos_pcie_probe);

}

subsys_initcall(exynos_pcie_init);
 


MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>");

MODULE_DESCRIPTION("Samsung PCIe host controller driver");

MODULE_LICENSE("GPL v2");

drivers/pci/host/pci-host-common.c

+2 −5
Original line number Diff line number Diff line 
/*

 * Generic PCI host driver common code

 *

 * 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.
@@ -17,7 +19,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_pci.h>

#include <linux/pci-ecam.h>
@@ -162,7 +163,3 @@ int pci_host_common_probe(struct platform_device *pdev, 
	pci_bus_add_devices(bus);

	return 0;

}
 


MODULE_DESCRIPTION("Generic PCI host driver common code");

MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");

MODULE_LICENSE("GPL v2");

drivers/pci/host/pci-imx6.c

+1 −8
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ static const struct of_device_id imx6_pcie_of_match[] = { 
	{ .compatible = "fsl,imx6qp-pcie", .data = (void *)IMX6QP, },

	{},

};

MODULE_DEVICE_TABLE(of, imx6_pcie_of_match);



static struct platform_driver imx6_pcie_driver = {

	.driver = {
@@ -749,14 +748,8 @@ static struct platform_driver imx6_pcie_driver = { 
	.shutdown = imx6_pcie_shutdown,

};



/* Freescale PCIe driver does not allow module unload */



static int __init imx6_pcie_init(void)

{

	return platform_driver_probe(&imx6_pcie_driver, imx6_pcie_probe);

}

module_init(imx6_pcie_init);



MODULE_AUTHOR("Sean Cross <xobs@kosagi.com>");

MODULE_DESCRIPTION("Freescale i.MX6 PCIe host controller driver");

MODULE_LICENSE("GPL v2");
 
device_initcall(imx6_pcie_init);

drivers/pci/host/pcie-altera-msi.c

+5 −5
Original line number Diff line number Diff line 
/*

 * Altera PCIe MSI support

 *

 * Author: Ley Foon Tan <lftan@altera.com>

 *

 * Copyright Altera Corporation (C) 2013-2015. All rights reserved

 *

 * This program is free software; you can redistribute it and/or modify it
@@ -16,7 +20,7 @@ 


#include <linux/interrupt.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/msi.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>
@@ -308,7 +312,3 @@ static int __init altera_msi_init(void) 
	return platform_driver_register(&altera_msi_driver);

}

subsys_initcall(altera_msi_init);
 


MODULE_AUTHOR("Ley Foon Tan <lftan@altera.com>");

MODULE_DESCRIPTION("Altera PCIe MSI support");

MODULE_LICENSE("GPL v2");