aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mcs814x/files-3.3/drivers
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-03-17 14:33:18 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-03-17 14:33:18 +0000
commit0d1596f2c8b825ec5a7cf677633eaffa1158d678 (patch)
tree3c8e67fceec02f53c9f8cfbde349c6f2ee9c61ad /target/linux/mcs814x/files-3.3/drivers
parent513d4fc9c9f242b096187acaff8b910f36b54964 (diff)
downloadupstream-0d1596f2c8b825ec5a7cf677633eaffa1158d678.tar.gz
upstream-0d1596f2c8b825ec5a7cf677633eaffa1158d678.tar.bz2
upstream-0d1596f2c8b825ec5a7cf677633eaffa1158d678.zip
mcs814x: use devm_request_and_ioremap in mcs814x-rng driver
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36063 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mcs814x/files-3.3/drivers')
-rw-r--r--target/linux/mcs814x/files-3.3/drivers/char/hw_random/mcs814x-rng.c9
1 files changed, 1 insertions, 8 deletions
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;