Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[karo-tx-linux.git] / drivers / usb / host / ehci-mv.c

diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 08147c35f83608aec8d895d981be5b37b7a7c30e..849806a75f1ce9223dc716fe8d626ba1b4a7cee5 100644 (file)
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -153,7 +153,6 @@ static int mv_ehci_probe(struct platform_device *pdev)
 
        ehci_mv = devm_kzalloc(&pdev->dev, sizeof(*ehci_mv), GFP_KERNEL);
        if (ehci_mv == NULL) {
-               dev_err(&pdev->dev, "cannot allocate ehci_hcd_mv\n");
                retval = -ENOMEM;
                goto err_put_hcd;
        }
@@ -170,12 +169,6 @@ static int mv_ehci_probe(struct platform_device *pdev)
        }
 
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phyregs");
-       if (r == NULL) {
-               dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
-               retval = -ENODEV;
-               goto err_put_hcd;
-       }
-
        ehci_mv->phy_regs = devm_ioremap_resource(&pdev->dev, r);
        if (IS_ERR(ehci_mv->phy_regs)) {
                retval = PTR_ERR(ehci_mv->phy_regs);
@@ -183,12 +176,6 @@ static int mv_ehci_probe(struct platform_device *pdev)
        }
 
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "capregs");
-       if (!r) {
-               dev_err(&pdev->dev, "no I/O memory resource defined\n");
-               retval = -ENODEV;
-               goto err_put_hcd;
-       }
-
        ehci_mv->cap_regs = devm_ioremap_resource(&pdev->dev, r);
        if (IS_ERR(ehci_mv->cap_regs)) {
                retval = PTR_ERR(ehci_mv->cap_regs);