Merge branches 'pci/host-exynos', 'pci/host-imx6', 'pci/resource' and 'pci/misc'...

[platform/kernel/linux-rpi.git] / drivers / pci / host / pci-exynos.c

diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
index 3de6bfb..1632661 100644 (file)
--- a/drivers/pci/host/pci-exynos.c
+++ b/drivers/pci/host/pci-exynos.c
@@ -415,9 +415,7 @@ static irqreturn_t exynos_pcie_msi_irq_handler(int irq, void *arg)
 {
        struct pcie_port *pp = arg;
 
-       dw_handle_msi_irq(pp);
-
-       return IRQ_HANDLED;
+       return dw_handle_msi_irq(pp);
 }
 
 static void exynos_pcie_msi_init(struct pcie_port *pp)
@@ -511,7 +509,8 @@ static struct pcie_host_ops exynos_pcie_host_ops = {
        .host_init = exynos_pcie_host_init,
 };
 
-static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev)
+static int __init add_pcie_port(struct pcie_port *pp,
+                               struct platform_device *pdev)
 {
        int ret;
 
@@ -568,10 +567,8 @@ static int __init exynos_pcie_probe(struct platform_device *pdev)
 
        exynos_pcie = devm_kzalloc(&pdev->dev, sizeof(*exynos_pcie),
                                GFP_KERNEL);
-       if (!exynos_pcie) {
-               dev_err(&pdev->dev, "no memory for exynos pcie\n");
+       if (!exynos_pcie)
                return -ENOMEM;
-       }
 
        pp = &exynos_pcie->pp;