Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-block.git] / drivers / crypto / img-hash.c

diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index fe93d19e304495bdf96e7b86b657244a39376c5f..359aa2b41016e77af00e3462b5a3916e7491738f 100644 (file)
--- a/drivers/crypto/img-hash.c
+++ b/drivers/crypto/img-hash.c
@@ -209,7 +209,7 @@ static int img_hash_xmit_cpu(struct img_hash_dev *hdev, const u8 *buf,
 
 static void img_hash_dma_callback(void *data)
 {
-       struct img_hash_dev *hdev = (struct img_hash_dev *)data;
+       struct img_hash_dev *hdev = data;
        struct img_hash_request_ctx *ctx = ahash_request_ctx(hdev->req);
 
        if (ctx->bufcnt) {
@@ -927,7 +927,7 @@ finish:
        img_hash_finish_req(hdev->req, err);
 }
 
-static const struct of_device_id img_hash_match[] = {
+static const struct of_device_id img_hash_match[] __maybe_unused = {
        { .compatible = "img,hash-accelerator" },
        {}
 };
@@ -966,8 +966,7 @@ static int img_hash_probe(struct platform_device *pdev)
        }
 
        /* Write port (DMA or CPU) */
-       hash_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       hdev->cpu_addr = devm_ioremap_resource(dev, hash_res);
+       hdev->cpu_addr = devm_platform_get_and_ioremap_resource(pdev, 1, &hash_res);
        if (IS_ERR(hdev->cpu_addr)) {
                err = PTR_ERR(hdev->cpu_addr);
                goto res_err;