[PATCH v4 0/2] devres: A couple of cleanups

[PATCH v4 0/2] devres: A couple of cleanups

[Andy Shevchenko]

A couple of ad-hoc cleanups. No functional changes intended.

v4:
- rebased on top of the latest vanilla (v6.9-rcX)

v3:
- rebased on top of driver-core-testing (Philipp)
- added tags (Philipp)

v2:
- fixed plural vs. singular "to have" (Philipp)

Andy Shevchenko (2):
  devres: Switch to use dev_err_probe() for unification
  devres: Don't use "proxy" headers

 lib/devres.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

-- 
2.43.0.rc1.1.gbec44491f096

[PATCH v4 1/2] devres: Switch to use dev_err_probe() for unification

[Andy Shevchenko]

The devm_*() APIs are supposed to be called during the ->probe() stage.
Many drivers (especially new ones) have switched to use dev_err_probe()
for error messaging for the sake of unification. Let's do the same in
the devres APIs.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 lib/devres.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/devres.c b/lib/devres.c
index fe0c63caeb68..27f280a39dca 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -125,12 +125,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 +145,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;
-- 
2.43.0.rc1.1.gbec44491f096

[PATCH v4 2/2] devres: Don't use "proxy" headers

[Andy Shevchenko]

Update header inclusions to follow IWYU (Include What You Use)
principle.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 lib/devres.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/devres.c b/lib/devres.c
index 27f280a39dca..4fc152de6d8b 100644
--- 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,
-- 
2.43.0.rc1.1.gbec44491f096

Re: [PATCH v4 0/2] devres: A couple of cleanups

[Philipp Stanner]

On Wed, 2024-04-03 at 13:46 +0300, Andy Shevchenko wrote:
> A couple of ad-hoc cleanups. No functional changes intended.

But it seems that since v3 my "Reviewed-by"s have disappeared. Is that
intentional, should I look through it again?

P.

> 
> v4:
> - rebased on top of the latest vanilla (v6.9-rcX)
> 
> v3:
> - rebased on top of driver-core-testing (Philipp)
> - added tags (Philipp)
> 
> v2:
> - fixed plural vs. singular "to have" (Philipp)
> 
> Andy Shevchenko (2):
>   devres: Switch to use dev_err_probe() for unification
>   devres: Don't use "proxy" headers
> 
>  lib/devres.c | 26 +++++++++++++++-----------
>  1 file changed, 15 insertions(+), 11 deletions(-)
> 

Re: [PATCH v4 0/2] devres: A couple of cleanups

[Andy Shevchenko]

On Wed, Apr 03, 2024 at 12:53:22PM +0200, Philipp Stanner wrote:
> On Wed, 2024-04-03 at 13:46 +0300, Andy Shevchenko wrote:
> > A couple of ad-hoc cleanups. No functional changes intended.
> 
> But it seems that since v3 my "Reviewed-by"s have disappeared. Is that
> intentional, should I look through it again?

Oops, it's utterly unintentional, sorry. I haven't done any changes.
It is basically a repetition of v2 (i.e. based on your code).

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v4 0/2] devres: A couple of cleanups

[Philipp Stanner]

On Wed, 2024-04-03 at 14:03 +0300, Andy Shevchenko wrote:
> On Wed, Apr 03, 2024 at 12:53:22PM +0200, Philipp Stanner wrote:
> > On Wed, 2024-04-03 at 13:46 +0300, Andy Shevchenko wrote:
> > > A couple of ad-hoc cleanups. No functional changes intended.
> > 
> > But it seems that since v3 my "Reviewed-by"s have disappeared. Is
> > that
> > intentional, should I look through it again?
> 
> Oops, it's utterly unintentional, sorry. I haven't done any changes.
> It is basically a repetition of v2 (i.e. based on your code).
> 

Alright, no problem – feel free to re-apply it

Reviewed-by: Philipp Stanner <pstanner@redhat.com>