Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / pci / host / pci-dra7xx.c

diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c
index 52b34fe..2d57e19 100644 (file)
--- a/drivers/pci/host/pci-dra7xx.c
+++ b/drivers/pci/host/pci-dra7xx.c
@@ -270,8 +270,8 @@ static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg)
        return IRQ_HANDLED;
 }
 
-static int add_pcie_port(struct dra7xx_pcie *dra7xx,
-                         struct platform_device *pdev)
+static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
+                                      struct platform_device *pdev)
 {
        int ret;
        struct pcie_port *pp;
@@ -398,7 +398,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, dra7xx);
 
-       ret = add_pcie_port(dra7xx, pdev);
+       ret = dra7xx_add_pcie_port(dra7xx, pdev);
        if (ret < 0)
                goto err_add_port;
 
@@ -446,7 +446,6 @@ static struct platform_driver dra7xx_pcie_driver = {
        .remove         = __exit_p(dra7xx_pcie_remove),
        .driver = {
                .name   = "dra7-pcie",
-               .owner  = THIS_MODULE,
                .of_match_table = of_dra7xx_pcie_match,
        },
 };