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

Commit 945478a7 authored by Julia Lawall's avatar Julia Lawall Committed by Herbert Xu
Browse files

hwrng: omap - use devm_request_and_ioremap 



Using devm_request_and_ioremap is more concise.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent bdd3f7fa

drivers/char/hw_random/omap-rng.c

+2 −20
Original line number Original line Diff line number Diff line
@@ -113,22 +113,12 @@ static int __devinit omap_rng_probe(struct platform_device *pdev) 




	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);





	if (!res) {

	rng_base = devm_request_and_ioremap(&pdev->dev, res);

		ret = -ENOENT;

		goto err_region;

	}



	if (!request_mem_region(res->start, resource_size(res), pdev->name)) {

		ret = -EBUSY;

		goto err_region;

	}



	dev_set_drvdata(&pdev->dev, res);

	rng_base = ioremap(res->start, resource_size(res));

	if (!rng_base) {

	if (!rng_base) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto err_ioremap;

		goto err_ioremap;

	}

	}

	dev_set_drvdata(&pdev->dev, res);





	ret = hwrng_register(&omap_rng_ops);

	ret = hwrng_register(&omap_rng_ops);

	if (ret)

	if (ret)
@@ -143,11 +133,8 @@ static int __devinit omap_rng_probe(struct platform_device *pdev) 
	return 0;

	return 0;





err_register:

err_register:

	iounmap(rng_base);

	rng_base = NULL;

	rng_base = NULL;

err_ioremap:

err_ioremap:

	release_mem_region(res->start, resource_size(res));

err_region:

	if (cpu_is_omap24xx()) {

	if (cpu_is_omap24xx()) {

		clk_disable(rng_ick);

		clk_disable(rng_ick);

		clk_put(rng_ick);

		clk_put(rng_ick);
@@ -157,20 +144,15 @@ static int __devinit omap_rng_probe(struct platform_device *pdev) 




static int __exit omap_rng_remove(struct platform_device *pdev)

static int __exit omap_rng_remove(struct platform_device *pdev)

{

{

	struct resource *res = dev_get_drvdata(&pdev->dev);



	hwrng_unregister(&omap_rng_ops);

	hwrng_unregister(&omap_rng_ops);





	omap_rng_write_reg(RNG_MASK_REG, 0x0);

	omap_rng_write_reg(RNG_MASK_REG, 0x0);





	iounmap(rng_base);



	if (cpu_is_omap24xx()) {

	if (cpu_is_omap24xx()) {

		clk_disable(rng_ick);

		clk_disable(rng_ick);

		clk_put(rng_ick);

		clk_put(rng_ick);

	}

	}





	release_mem_region(res->start, resource_size(res));

	rng_base = NULL;

	rng_base = NULL;





	return 0;

	return 0;