Merge tag 'microblaze-v6.6' of git://git.monstr.eu/linux-2.6-microblaze

[J-linux.git] / drivers / fpga / xilinx-pr-decoupler.c

diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index b76d85449b8fb2a15e9cea2cd563663ccbd8f61e..208d9560f56d590b02f9f6f67adce6119f650009 100644 (file)
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/drivers/fpga/xilinx-pr-decoupler.c
@@ -108,7 +108,6 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
        struct xlnx_pr_decoupler_data *priv;
        struct fpga_bridge *br;
        int err;
-       struct resource *res;
 
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -122,8 +121,7 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
                        priv->ipconfig = match->data;
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       priv->io_base = devm_ioremap_resource(&pdev->dev, res);
+       priv->io_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(priv->io_base))
                return PTR_ERR(priv->io_base);