summaryrefslogtreecommitdiffstats
path: root/drivers/char/hw_random/tx4939-rng.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-21 11:08:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-22 20:41:56 +0100
commitc7c9e1c372452688f0ef2af794789bbd00f9fa51 (patch)
tree24f46d6b8a6393db716fda9fd94916c2faafd427 /drivers/char/hw_random/tx4939-rng.c
parentlib: devres: Introduce devm_ioremap_resource() (diff)
downloadlinux-c7c9e1c372452688f0ef2af794789bbd00f9fa51.tar.xz
linux-c7c9e1c372452688f0ef2af794789bbd00f9fa51.zip
char: Convert to devm_ioremap_resource()
Convert all uses of devm_request_and_ioremap() to the newly introduced devm_ioremap_resource() which provides more consistent error handling. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/hw_random/tx4939-rng.c')
-rw-r--r--drivers/char/hw_random/tx4939-rng.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/hw_random/tx4939-rng.c b/drivers/char/hw_random/tx4939-rng.c
index de473ef3882b..30991989d65b 100644
--- a/drivers/char/hw_random/tx4939-rng.c
+++ b/drivers/char/hw_random/tx4939-rng.c
@@ -7,6 +7,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
+#include <linux/err.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@ -115,9 +116,9 @@ static int __init tx4939_rng_probe(struct platform_device *dev)
rngdev = devm_kzalloc(&dev->dev, sizeof(*rngdev), GFP_KERNEL);
if (!rngdev)
return -ENOMEM;
- rngdev->base = devm_request_and_ioremap(&dev->dev, r);
- if (!rngdev->base)
- return -EBUSY;
+ rngdev->base = devm_ioremap_resource(&dev->dev, r);
+ if (IS_ERR(rngdev->base))
+ return PTR_ERR(rngdev->base);
rngdev->rng.name = dev_name(&dev->dev);
rngdev->rng.data_present = tx4939_rng_data_present;