1 files changed, 7 insertions, 5 deletions

diff --git a/lib/devres.c b/lib/devres.c
index 823533138fa0..48cb3c7bd7de 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -81,11 +81,13 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
 void devm_iounmap(struct device *dev, void __iomem *addr)
 {
         WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
-                               (void *)addr));
+                               (__force void *)addr));
         iounmap(addr);
 }
 EXPORT_SYMBOL(devm_iounmap);
 
+#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err)
+
 /**
  * devm_ioremap_resource() - check, request region, and ioremap resource
  * @dev: generic device to handle the resource for
@@ -114,7 +116,7 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
 
         if (!res || resource_type(res) != IORESOURCE_MEM) {
                 dev_err(dev, "invalid resource\n");
-                return ERR_PTR(-EINVAL);
+                return IOMEM_ERR_PTR(-EINVAL);
         }
 
         size = resource_size(res);
@@ -122,7 +124,7 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
 
         if (!devm_request_mem_region(dev, res->start, size, name)) {
                 dev_err(dev, "can't request region for resource %pR\n", res);
-                return ERR_PTR(-EBUSY);
+                return IOMEM_ERR_PTR(-EBUSY);
         }
 
         if (res->flags & IORESOURCE_CACHEABLE)
@@ -133,7 +135,7 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
         if (!dest_ptr) {
                 dev_err(dev, "ioremap failed for resource %pR\n", res);
                 devm_release_mem_region(dev, res->start, size);
-                dest_ptr = ERR_PTR(-ENOMEM);
+                dest_ptr = IOMEM_ERR_PTR(-ENOMEM);
         }
 
         return dest_ptr;
@@ -224,7 +226,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
 {
         ioport_unmap(addr);
         WARN_ON(devres_destroy(dev, devm_ioport_map_release,
-                               devm_ioport_map_match, (void *)addr));
+                               devm_ioport_map_match, (__force void *)addr));
 }
 EXPORT_SYMBOL(devm_ioport_unmap);
 #endif /* CONFIG_HAS_IOPORT */