Merge tag 'mm-nonmm-stable-2024-05-19-11-56' of git://git.kernel.org/pub/scm/linux...

[linux-block.git] / lib / devres.c

diff --git a/lib/devres.c b/lib/devres.c
index fe0c63caeb6892132ea208529715b71176c9ea26..4fc152de6d8bb1232aeca382a313bd9ff56b8f60 100644 (file)
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -1,10 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0
+#include <linux/bug.h>
 #include <linux/device.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/gfp.h>
+#include <linux/errno.h>
 #include <linux/export.h>
+#include <linux/gfp_types.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
 #include <linux/of_address.h>
+#include <linux/types.h>
 
 enum devm_ioremap_type {
        DEVM_IOREMAP = 0,
@@ -125,12 +128,13 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res,
        resource_size_t size;
        void __iomem *dest_ptr;
        char *pretty_name;
+       int ret;
 
        BUG_ON(!dev);
 
        if (!res || resource_type(res) != IORESOURCE_MEM) {
-               dev_err(dev, "invalid resource %pR\n", res);
-               return IOMEM_ERR_PTR(-EINVAL);
+               ret = dev_err_probe(dev, -EINVAL, "invalid resource %pR\n", res);
+               return IOMEM_ERR_PTR(ret);
        }
 
        if (type == DEVM_IOREMAP && res->flags & IORESOURCE_MEM_NONPOSTED)
@@ -144,20 +148,20 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res,
        else
                pretty_name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL);
        if (!pretty_name) {
-               dev_err(dev, "can't generate pretty name for resource %pR\n", res);
-               return IOMEM_ERR_PTR(-ENOMEM);
+               ret = dev_err_probe(dev, -ENOMEM, "can't generate pretty name for resource %pR\n", res);
+               return IOMEM_ERR_PTR(ret);
        }
 
        if (!devm_request_mem_region(dev, res->start, size, pretty_name)) {
-               dev_err(dev, "can't request region for resource %pR\n", res);
-               return IOMEM_ERR_PTR(-EBUSY);
+               ret = dev_err_probe(dev, -EBUSY, "can't request region for resource %pR\n", res);
+               return IOMEM_ERR_PTR(ret);
        }
 
        dest_ptr = __devm_ioremap(dev, res->start, size, type);
        if (!dest_ptr) {
-               dev_err(dev, "ioremap failed for resource %pR\n", res);
                devm_release_mem_region(dev, res->start, size);
-               dest_ptr = IOMEM_ERR_PTR(-ENOMEM);
+               ret = dev_err_probe(dev, -ENOMEM, "ioremap failed for resource %pR\n", res);
+               return IOMEM_ERR_PTR(ret);
        }
 
        return dest_ptr;