aboutsummaryrefslogtreecommitdiffstats
path: root/lib/devres.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-05-23 22:29:32 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-24 07:28:01 +0900
commit609013204fddd25ffde8ff5e1f32d72314397e14 (patch)
tree98525374a85b2153c89c1f94db6e7fbf1dc954bb /lib/devres.c
parentMerge 3.15-rc6 into driver-core-next (diff)
downloadlinux-dev-609013204fddd25ffde8ff5e1f32d72314397e14.tar.xz
linux-dev-609013204fddd25ffde8ff5e1f32d72314397e14.zip
lib/devres.c: use dev in devm_request_and_ioremap
devm_request_and_ioremap was the only function to use device instead of dev. This fixes kernel-doc warning. Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/devres.c')
-rw-r--r--lib/devres.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/devres.c b/lib/devres.c
index 2f16c133fd36..c7596bb54cf3 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -157,12 +157,12 @@ EXPORT_SYMBOL(devm_ioremap_resource);
* if (!base)
* return -EADDRNOTAVAIL;
*/
-void __iomem *devm_request_and_ioremap(struct device *device,
+void __iomem *devm_request_and_ioremap(struct device *dev,
struct resource *res)
{
void __iomem *dest_ptr;
- dest_ptr = devm_ioremap_resource(device, res);
+ dest_ptr = devm_ioremap_resource(dev, res);
if (IS_ERR(dest_ptr))
return NULL;