Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ea376a3 authored by Boris Brezillon's avatar Boris Brezillon Committed by Herbert Xu
Browse files

crypto: mv_cesa - request registers memory region 



The mv_cesa driver does not request the CESA registers memory region.
Since we're about to add a new CESA driver, we need to make sure only one
of these drivers probe the CESA device, and requesting the registers memory
region is a good way to achieve that.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a5a22e57

drivers/crypto/mv_cesa.c

+5 −8
Original line number Diff line number Diff line
@@ -1041,23 +1041,23 @@ static int mv_probe(struct platform_device *pdev) 


	spin_lock_init(&cp->lock);

	crypto_init_queue(&cp->queue, 50);

	cp->reg = ioremap(res->start, resource_size(res));

	if (!cp->reg) {

		ret = -ENOMEM;

	cp->reg = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(cp->reg)) {

		ret = PTR_ERR(cp->reg);

		goto err;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram");

	if (!res) {

		ret = -ENXIO;

		goto err_unmap_reg;

		goto err;

	}

	cp->sram_size = resource_size(res);

	cp->max_req_size = cp->sram_size - SRAM_CFG_SPACE;

	cp->sram = ioremap(res->start, cp->sram_size);

	if (!cp->sram) {

		ret = -ENOMEM;

		goto err_unmap_reg;

		goto err;

	}



	if (pdev->dev.of_node)
@@ -1136,8 +1136,6 @@ static int mv_probe(struct platform_device *pdev) 
	kthread_stop(cp->queue_th);

err_unmap_sram:

	iounmap(cp->sram);

err_unmap_reg:

	iounmap(cp->reg);

err:

	kfree(cp);

	cpg = NULL;
@@ -1158,7 +1156,6 @@ static int mv_remove(struct platform_device *pdev) 
	free_irq(cp->irq, cp);

	memset(cp->sram, 0, cp->sram_size);

	iounmap(cp->sram);

	iounmap(cp->reg);



	if (!IS_ERR(cp->clk)) {

		clk_disable_unprepare(cp->clk);