The main difference between devm_ioremap() and devm_ioremap_resource()
(apart from the different way to pass the area to map) is that the latter
also calls devm_request_mem() which is unintuitive and yields problems
like
https://lore.kernel.org/r/1555670144-24220-1-git-send-email-aisheng.d...@nxp.com
.
So rename devm_ioremap_resource and it's relative devm_ioremap_resource_wc
to include "request" in their name.
Until all users are converted, provide wrappers with the old name.
Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
---
.../driver-api/driver-model/devres.rst | 4 +--
include/linux/device.h | 31 ++++++++++++++++---
lib/devres.c | 18 +++++------
3 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/Documentation/driver-api/driver-model/devres.rst
b/Documentation/driver-api/driver-model/devres.rst
index bb676570acc3..65f9f44d5c39 100644
--- a/Documentation/driver-api/driver-model/devres.rst
+++ b/Documentation/driver-api/driver-model/devres.rst
@@ -309,8 +309,8 @@ IOMAP
devm_ioremap()
devm_ioremap_uc()
devm_ioremap_wc()
- devm_ioremap_resource() : checks resource, requests memory region, ioremaps
- devm_ioremap_resource_wc()
+ devm_request_ioremap_resource() : checks resource, requests memory region,
ioremaps
+ devm_request_ioremap_resource_wc()
devm_platform_ioremap_resource() : calls devm_ioremap_resource() for
platform device
devm_platform_ioremap_resource_wc()
devm_platform_ioremap_resource_byname()
diff --git a/include/linux/device.h b/include/linux/device.h
index 5ed101be7b2e..927992549db9 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -240,10 +240,33 @@ unsigned long devm_get_free_pages(struct device *dev,
gfp_t gfp_mask, unsigned int order);
void devm_free_pages(struct device *dev, unsigned long addr);
-void __iomem *devm_ioremap_resource(struct device *dev,
- const struct resource *res);
-void __iomem *devm_ioremap_resource_wc(struct device *dev,
- const struct resource *res);
+void __iomem *devm_request_ioremap_resource(struct device *dev,
+ const struct resource *res);
+/*
+ * devm_ioremap_resource() was the initial name chosen for
+ * devm_request_ioremap_resource(). Please stick to the latter for clearer
+ * semantics.
+ */
+static inline void __iomem *
+devm_ioremap_resource(struct device *dev, const struct resource *res)
+{
+ return devm_request_ioremap_resource(dev, res);
+}
+
+void __iomem *devm_request_ioremap_resource_wc(struct device *dev,
+ const struct resource *res);
+
+/*
+ * devm_ioremap_resource_wc() was the initial name chosen for
+ * devm_request_ioremap_resource_wc(). Please stick to the latter for clearer
+ * semantics.
+ */
+static inline void __iomem *
+devm_ioremap_resource_wc(struct device *dev,
+ const struct resource *res)
+{
+ return devm_request_ioremap_resource_wc(dev, res);
+}
void __iomem *devm_of_iomap(struct device *dev,
struct device_node *node, int index,
diff --git a/lib/devres.c b/lib/devres.c
index 2a4ff5d64288..907588f1a5b7 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -114,8 +114,8 @@ void devm_iounmap(struct device *dev, void __iomem *addr)
EXPORT_SYMBOL(devm_iounmap);
static void __iomem *
-__devm_ioremap_resource(struct device *dev, const struct resource *res,
- enum devm_ioremap_type type)
+__devm_request_ioremap_resource(struct device *dev, const struct resource *res,
+ enum devm_ioremap_type type)
{
resource_size_t size;
void __iomem *dest_ptr;
@@ -172,12 +172,12 @@ __devm_ioremap_resource(struct device *dev, const struct
resource *res,
* Return: a pointer to the remapped memory or an ERR_PTR() encoded error code
* on failure.
*/
-void __iomem *devm_ioremap_resource(struct device *dev,
- const struct resource *res)
+void __iomem *devm_request_ioremap_resource(struct device *dev,
+ const struct resource *res)
{
- return __devm_ioremap_resource(dev, res, DEVM_IOREMAP);
+ return __devm_request_ioremap_resource(dev, res, DEVM_IOREMAP);
}
-EXPORT_SYMBOL(devm_ioremap_resource);
+EXPORT_SYMBOL(devm_request_ioremap_resource);
/**
* devm_ioremap_resource_wc() - write-combined variant of
@@ -188,10 +188,10 @@ EXPORT_SYMBOL(devm_ioremap_resource);
* Return: a pointer to the remapped memory or an ERR_PTR() encoded error code
* on failure.
*/
-void __iomem *devm_ioremap_resource_wc(struct device *dev,
- const struct resource *res)
+void __iomem *devm_request_ioremap_resource_wc(struct device *dev,
+ const struct resource *res)
{
- return __devm_ioremap_resource(dev, res, DEVM_IOREMAP_WC);
+ return __devm_request_ioremap_resource(dev, res, DEVM_IOREMAP_WC);
}
/*
--
2.28.0
