Merge git://git.infradead.org/users/willy/linux-nvme

[karo-tx-linux.git] / drivers / crypto / sahara.c

diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c
index 785a9ded7bdf3bda2840bc36daa88fe7f1532a9b..07a5987ce67d4783a1ffd3dbecc6151efb791d4a 100644 (file)
--- a/drivers/crypto/sahara.c
+++ b/drivers/crypto/sahara.c
@@ -885,22 +885,9 @@ static int sahara_probe(struct platform_device *pdev)
 
        /* Get the base address */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "failed to get memory region resource\n");
-               return -ENODEV;
-       }
-
-       if (devm_request_mem_region(&pdev->dev, res->start,
-                       resource_size(res), SAHARA_NAME) == NULL) {
-               dev_err(&pdev->dev, "failed to request memory region\n");
-               return -ENOENT;
-       }
-       dev->regs_base = devm_ioremap(&pdev->dev, res->start,
-                                     resource_size(res));
-       if (!dev->regs_base) {
-               dev_err(&pdev->dev, "failed to ioremap address region\n");
-               return -ENOENT;
-       }
+       dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(dev->regs_base))
+               return PTR_ERR(dev->regs_base);
 
        /* Get the IRQ */
        irq = platform_get_irq(pdev,  0);
@@ -909,10 +896,11 @@ static int sahara_probe(struct platform_device *pdev)
                return irq;
        }
 
-       if (devm_request_irq(&pdev->dev, irq, sahara_irq_handler,
-               0, SAHARA_NAME, dev) < 0) {
+       err = devm_request_irq(&pdev->dev, irq, sahara_irq_handler,
+                              0, dev_name(&pdev->dev), dev);
+       if (err) {
                dev_err(&pdev->dev, "failed to request irq\n");
-               return -ENOENT;
+               return err;
        }
 
        /* clocks */