From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 17 Mar 2013 14:33:18 +0000 (+0000)
Subject: mcs814x: use devm_request_and_ioremap in mcs814x-rng driver
X-Git-Tag: reboot~10904
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9cef30a5197814e04aafc86bd22cf0e481a10472;p=openwrt%2Fstaging%2Fxback.git

mcs814x: use devm_request_and_ioremap in mcs814x-rng driver

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 36063
---

diff --git a/target/linux/mcs814x/files-3.3/drivers/char/hw_random/mcs814x-rng.c b/target/linux/mcs814x/files-3.3/drivers/char/hw_random/mcs814x-rng.c
index b1e95810dd..5e3d8f2479 100644
--- a/target/linux/mcs814x/files-3.3/drivers/char/hw_random/mcs814x-rng.c
+++ b/target/linux/mcs814x/files-3.3/drivers/char/hw_random/mcs814x-rng.c
@@ -61,14 +61,7 @@ static int mcs814x_rng_probe(struct platform_device *pdev)
 	rng->name = pdev->name;
 	rng->data_read = mcs814x_rng_data_read;
 
-	if (!devm_request_mem_region(&pdev->dev,
-				res->start, resource_size(res),
-				pdev->name)) {
-		ret = -EBUSY;
-		goto out_rng;
-	}
-
-	priv->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+	priv->regs = devm_request_and_ioremap(&pdev->dev, res);
 	if (!priv->regs) {
 		ret = -ENOMEM;
 		goto out_rng;