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

[linux-2.6-block.git] / drivers / pci / host / pci-keystone.c

diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 1b893bc8b84222591cd81cdbfd6683326a11cd7d..78f79e31ac5c4a23f87978f5fe64a250e162931d 100644 (file)
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -353,10 +353,9 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
 
        ks_pcie = devm_kzalloc(&pdev->dev, sizeof(*ks_pcie),
                                GFP_KERNEL);
-       if (!ks_pcie) {
-               dev_err(dev, "no memory for keystone pcie\n");
+       if (!ks_pcie)
                return -ENOMEM;
-       }
+
        pp = &ks_pcie->pp;
 
        /* initialize SerDes Phy if present */
@@ -403,7 +402,6 @@ static struct platform_driver ks_pcie_driver __refdata = {
        .remove = __exit_p(ks_pcie_remove),
        .driver = {
                .name   = "keystone-pcie",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(ks_pcie_of_match),
        },
 };