From 609013204fddd25ffde8ff5e1f32d72314397e14 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Fri, 23 May 2014 22:29:32 +0200 Subject: 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 Signed-off-by: Fabian Frederick Signed-off-by: Greg Kroah-Hartman --- lib/devres.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/devres.c') diff --git a/lib/devres.c b/lib/devres.c index 2f16c133fd3..c7596bb54cf 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; -- cgit v1.2.3-70-g09d2 From 5cbb00cc4aae56378bf5376a62b4df3b89c28f92 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Fri, 23 May 2014 22:30:50 +0200 Subject: lib/devres.c: fix checkpatch warnings Fix 3 checkpatch warnings: 'ERROR: "foo * const * bar" should be "foo * const *bar"' Cc: Andrew Morton Signed-off-by: Fabian Frederick Signed-off-by: Greg Kroah-Hartman --- lib/devres.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/devres.c') diff --git a/lib/devres.c b/lib/devres.c index c7596bb54cf..f562bf6ff71 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -194,7 +194,7 @@ static int devm_ioport_map_match(struct device *dev, void *res, * Managed ioport_map(). Map is automatically unmapped on driver * detach. */ -void __iomem * devm_ioport_map(struct device *dev, unsigned long port, +void __iomem *devm_ioport_map(struct device *dev, unsigned long port, unsigned int nr) { void __iomem **ptr, *addr; @@ -265,7 +265,7 @@ static void pcim_iomap_release(struct device *gendev, void *res) * be safely called without context and guaranteed to succed once * allocated. */ -void __iomem * const * pcim_iomap_table(struct pci_dev *pdev) +void __iomem * const *pcim_iomap_table(struct pci_dev *pdev) { struct pcim_iomap_devres *dr, *new_dr; @@ -290,7 +290,7 @@ EXPORT_SYMBOL(pcim_iomap_table); * Managed pci_iomap(). Map is automatically unmapped on driver * detach. */ -void __iomem * pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen) +void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen) { void __iomem **tbl; -- cgit v1.2.3-70-g09d2