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

Commit 3f9850f2 authored by Wei Yongjun's avatar Wei Yongjun Committed by Lee Jones
Browse files

mfd: htc-egpio: Use devm_ioremap_nocache() instead of ioremap_nocache() 



Replace probe-time ioremap_nocache() call with devm_ioremap_nocache()
to avoid iounmap() missing and get rid of the corresponding iounmap()
call on remove.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent c8eaed45

drivers/mfd/htc-egpio.c

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,8 @@ static int __init egpio_probe(struct platform_device *pdev) 
	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		goto fail;

	ei->base_addr = ioremap_nocache(res->start, resource_size(res));

	ei->base_addr = devm_ioremap_nocache(&pdev->dev, res->start,

					     resource_size(res));

	if (!ei->base_addr)

		goto fail;

	pr_debug("EGPIO phys=%08x virt=%p\n", (u32)res->start, ei->base_addr);
@@ -380,7 +381,6 @@ static int __exit egpio_remove(struct platform_device *pdev) 
		irq_set_chained_handler(ei->chained_irq, NULL);

		device_init_wakeup(&pdev->dev, 0);

	}

	iounmap(ei->base_addr);



	return 0;

}