[PATCH 08/11] devres: support addresses greater than an unsigned long via dev_ioremap

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-kernel@...>
Cc: Kumar Gala <galak@...>, Tejun Heo <htejun@...>, Jeff Garzik <jgarzik@...>, Greg Kroah-Hartman <gregkh@...>
Date: Wednesday, April 30, 2008 - 7:57 pm

From: Kumar Gala <galak@kernel.crashing.org>

Use a resource_size_t instead of unsigned long since some arch's are
capable of having ioremap deal with addresses greater than the size of a
unsigned long.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 include/linux/io.h |    4 ++--
 lib/devres.c       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/linux/io.h b/include/linux/io.h
index e3b2dda..3a03a36 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -58,9 +58,9 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
 }
 #endif
 
-void __iomem * devm_ioremap(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
 			    unsigned long size);
-void __iomem * devm_ioremap_nocache(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
 				    unsigned long size);
 void devm_iounmap(struct device *dev, void __iomem *addr);
 int check_signature(const volatile void __iomem *io_addr,
diff --git a/lib/devres.c b/lib/devres.c
index edc27a5..26c87c4 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -20,7 +20,7 @@ static int devm_ioremap_match(struct device *dev, void *res, void *match_data)
  *
  * Managed ioremap().  Map is automatically unmapped on driver detach.
  */
-void __iomem *devm_ioremap(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
 			   unsigned long size)
 {
 	void __iomem **ptr, *addr;
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(devm_ioremap);
  * Managed ioremap_nocache().  Map is automatically unmapped on driver
  * detach.
  */
-void __iomem *devm_ioremap_nocache(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
 				   unsigned long size)
 {
 	void __iomem **ptr, *addr;
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 11/11] klist: fix coding style errors in klist.h and ..., Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 10/11] driver core: remove no longer used "struct cla..., Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 09/11] pcmcia: remove pccard_sysfs_interface warnings, Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 08/11] devres: support addresses greater than an unsi..., Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 07/11] kobject: do not copy vargs, just pass them aro..., Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 06/11] sysfs: sysfs_update_group stub for CONFIG_SYSF..., Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 05/11] DEBUGFS: Correct location of debugfs API docum..., Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 04/11] driver core: warn about duplicate driver names..., Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 03/11] klist: implement klist_add_{after|before}(), Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 02/11] klist: implement KLIST_INIT() and DEFINE_KLIST(), Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)
[PATCH 01/11] sysfs: Disallow truncation of files in sysfs, Greg Kroah-Hartman, (Wed Apr 30, 7:57 pm)