Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / drivers / crypto / mxs-dcp.c

diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c
index bdc4c42..f1fa637 100644 (file)
--- a/drivers/crypto/mxs-dcp.c
+++ b/drivers/crypto/mxs-dcp.c
@@ -986,8 +986,6 @@ static int mxs_dcp_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct dcp *sdcp = NULL;
        int i, ret;
-
-       struct resource *iores;
        int dcp_vmi_irq, dcp_irq;
 
        if (global_sdcp) {
@@ -995,7 +993,6 @@ static int mxs_dcp_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        dcp_vmi_irq = platform_get_irq(pdev, 0);
        if (dcp_vmi_irq < 0) {
                dev_err(dev, "Failed to get IRQ: (%d)!\n", dcp_vmi_irq);
@@ -1013,7 +1010,7 @@ static int mxs_dcp_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        sdcp->dev = dev;
-       sdcp->base = devm_ioremap_resource(dev, iores);
+       sdcp->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(sdcp->base))
                return PTR_ERR(sdcp->base);