UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI: mvebu: remove subsys_initcall 

This removes the subsys_initcall from the driver and converts it to
a normal platform_driver. Also, drvdata is set and a remove functions
is added to disable the clock and free resources. As pci driver removal
currently is not supported, set .suppress_bind_attrs to permit unbinding.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2013-08-13 14:25:22 +02:00 committed by Jason Cooper
parent bf09b6ae58
commit e5615c30c1
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/pci/host/pci-mvebu.c
View File

@ -165,7 +165,7 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
* BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks * BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
* WIN[0-3] -> DRAM bank[0-3] * WIN[0-3] -> DRAM bank[0-3]
*/ */
static void __init mvebu_pcie_setup_wins(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
{ {
const struct mbus_dram_target_info *dram; const struct mbus_dram_target_info *dram;
u32 size; u32 size;
@ -217,7 +217,7 @@ static void __init mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
port->base + PCIE_BAR_CTRL_OFF(1)); port->base + PCIE_BAR_CTRL_OFF(1));
} }
static void __init mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
{ {
u16 cmd; u16 cmd;
u32 mask; u32 mask;
@ -628,7 +628,7 @@ static struct pci_ops mvebu_pcie_ops = {
.write = mvebu_pcie_wr_conf, .write = mvebu_pcie_wr_conf,
}; };
static int __init mvebu_pcie_setup(int nr, struct pci_sys_data *sys) static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
{ {
struct mvebu_pcie *pcie = sys_to_pcie(sys); struct mvebu_pcie *pcie = sys_to_pcie(sys);
int i; int i;
@ -647,7 +647,7 @@ static int __init mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
return 1; return 1;
} }
static int __init mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) static int mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
struct of_irq oirq; struct of_irq oirq;
int ret; int ret;
@ -704,7 +704,7 @@ resource_size_t mvebu_pcie_align_resource(struct pci_dev *dev,
return start; return start;
} }
static void __init mvebu_pcie_enable(struct mvebu_pcie *pcie) static void mvebu_pcie_enable(struct mvebu_pcie *pcie)
{ {
struct hw_pci hw; struct hw_pci hw;
@ -727,10 +727,8 @@ static void __init mvebu_pcie_enable(struct mvebu_pcie *pcie)
* <...> property for one that matches the given port/lane. Once * <...> property for one that matches the given port/lane. Once
* found, maps it. * found, maps it.
*/ */
static void __iomem * __init static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,
mvebu_pcie_map_registers(struct platform_device *pdev, struct device_node *np, struct mvebu_pcie_port *port)
struct device_node *np,
struct mvebu_pcie_port *port)
{ {
struct resource regs; struct resource regs;
int ret = 0; int ret = 0;
@ -786,7 +784,7 @@ static int mvebu_get_tgt_attr(struct device_node *np, int devfn,
return -ENOENT; return -ENOENT;
} }
static void __init mvebu_pcie_msi_enable(struct mvebu_pcie *pcie) static void mvebu_pcie_msi_enable(struct mvebu_pcie *pcie)
{ {
struct device_node *msi_node; struct device_node *msi_node;
@ -801,7 +799,7 @@ static void __init mvebu_pcie_msi_enable(struct mvebu_pcie *pcie)
pcie->msi->dev = &pcie->pdev->dev; pcie->msi->dev = &pcie->pdev->dev;
} }
static int __init mvebu_pcie_probe(struct platform_device *pdev) static int mvebu_pcie_probe(struct platform_device *pdev)
{ {
struct mvebu_pcie *pcie; struct mvebu_pcie *pcie;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
@ -814,6 +812,7 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
pcie->pdev = pdev; pcie->pdev = pdev;
platform_set_drvdata(pdev, pcie);
/* Get the PCIe memory and I/O aperture */ /* Get the PCIe memory and I/O aperture */
mvebu_mbus_get_pcie_mem_aperture(&pcie->mem); mvebu_mbus_get_pcie_mem_aperture(&pcie->mem);
@ -957,16 +956,12 @@ static struct platform_driver mvebu_pcie_driver = {
.name = "mvebu-pcie", .name = "mvebu-pcie",
.of_match_table = .of_match_table =
of_match_ptr(mvebu_pcie_of_match_table), of_match_ptr(mvebu_pcie_of_match_table),
/* driver unloading/unbinding currently not supported */
.suppress_bind_attrs = true,
}, },
.probe = mvebu_pcie_probe,
}; };
module_platform_driver(mvebu_pcie_driver);
static int __init mvebu_pcie_init(void)
{
return platform_driver_probe(&mvebu_pcie_driver,
mvebu_pcie_probe);
}
subsys_initcall(mvebu_pcie_init);
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_DESCRIPTION("Marvell EBU PCIe driver"); MODULE_DESCRIPTION("Marvell EBU PCIe driver");