[PATCH 1/1] lib/devres.c: use dev in devm_request_and_ioremap

[PATCH 1/1] lib/devres.c: use dev in devm_request_and_ioremap

[Fabian Frederick]

devm_request_and_ioremap was the only function to use device
instead of dev(this fixes kernel-doc warning).

Also fix some checkpatch warnings.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 lib/devres.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/devres.c b/lib/devres.c
index 2f16c13..7ad789b 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -157,12 +157,11 @@ EXPORT_SYMBOL(devm_ioremap_resource);
  *	if (!base)
  *		return -EADDRNOTAVAIL;
  */
-void __iomem *devm_request_and_ioremap(struct device *device,
-				       struct resource *res)
+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;
 
@@ -194,7 +193,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 +264,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 +289,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;
 
-- 
1.8.4.5

Re: [PATCH 1/1] lib/devres.c: use dev in devm_request_and_ioremap

[Greg Kroah-Hartman]

On Thu, May 22, 2014 at 07:34:34PM +0200, Fabian Frederick wrote:
> devm_request_and_ioremap was the only function to use device
> instead of dev(this fixes kernel-doc warning).
> 
> Also fix some checkpatch warnings.

Each patch should just do 1 thing.  Please break this up into a bug fix
patch and then a patch for the checkpatch warning(s).

thanks,

greg k-h