rapidio: remove mport resource reservation from common RIO code

[karo-tx-linux.git] / arch / powerpc / sysdev / fsl_rio.c

diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 8d26533ba98e5ebf06ea6381c468080f10f9e0c5..14232d57369c4de4f373f76e095ec95bb559345e 100644 (file)
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1432,6 +1432,14 @@ int fsl_rio_setup(struct platform_device *dev)
        port->iores.flags = IORESOURCE_MEM;
        port->iores.name = "rio_io_win";
 
+       if (request_resource(&iomem_resource, &port->iores) < 0) {
+               dev_err(&dev->dev, "RIO: Error requesting master port region"
+                       " 0x%016llx-0x%016llx\n",
+                       (u64)port->iores.start, (u64)port->iores.end);
+                       rc = -ENOMEM;
+                       goto err_res;
+       }
+
        priv->pwirq   = irq_of_parse_and_map(dev->dev.of_node, 0);
        priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2);
        priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3);
@@ -1536,6 +1544,7 @@ int fsl_rio_setup(struct platform_device *dev)
        return 0;
 err:
        iounmap(priv->regs_win);
+err_res:
        kfree(priv);
 err_priv:
        kfree(port);