* [PATCH v3 0/2] devres: A couple of cleanups
@ 2024-03-01 17:55 Andy Shevchenko
2024-03-01 17:55 ` [PATCH v3 1/2] devres: Switch to use dev_err_probe() for unification Andy Shevchenko
2024-03-01 17:55 ` [PATCH v3 2/2] devres: Don't use "proxy" headers Andy Shevchenko
0 siblings, 2 replies; 3+ messages in thread
From: Andy Shevchenko @ 2024-03-01 17:55 UTC (permalink / raw
To: Andy Shevchenko, linux-kernel; +Cc: Andrew Morton
A couple of ad-hoc cleanups. No functional changes intended.
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 | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
--
2.43.0.rc1.1.gbec44491f096
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 1/2] devres: Switch to use dev_err_probe() for unification
2024-03-01 17:55 [PATCH v3 0/2] devres: A couple of cleanups Andy Shevchenko
@ 2024-03-01 17:55 ` Andy Shevchenko
2024-03-01 17:55 ` [PATCH v3 2/2] devres: Don't use "proxy" headers Andy Shevchenko
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2024-03-01 17:55 UTC (permalink / raw
To: Andy Shevchenko, linux-kernel; +Cc: Andrew Morton, Philipp Stanner
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.
Reviewed-by: Philipp Stanner <pstanner@redhat.com>
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 c44f104b58d5..f38e8297ad5a 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v3 2/2] devres: Don't use "proxy" headers
2024-03-01 17:55 [PATCH v3 0/2] devres: A couple of cleanups Andy Shevchenko
2024-03-01 17:55 ` [PATCH v3 1/2] devres: Switch to use dev_err_probe() for unification Andy Shevchenko
@ 2024-03-01 17:55 ` Andy Shevchenko
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2024-03-01 17:55 UTC (permalink / raw
To: Andy Shevchenko, linux-kernel; +Cc: Andrew Morton
Update header inclusions to follow IWYU (Include What You Use)
principle.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
lib/devres.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/devres.c b/lib/devres.c
index f38e8297ad5a..f4b72ad812b5 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -1,10 +1,14 @@
// SPDX-License-Identifier: GPL-2.0
-#include <linux/err.h>
-#include <linux/pci.h>
-#include <linux/io.h>
-#include <linux/gfp.h>
+#include <linux/bug.h>
+#include <linux/device.h>
+#include <linux/errno.h>
#include <linux/export.h>
+#include <linux/gfp_types.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
#include <linux/of_address.h>
+#include <linux/types.h>
enum devm_ioremap_type {
DEVM_IOREMAP = 0,
--
2.43.0.rc1.1.gbec44491f096
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-01 17:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-01 17:55 [PATCH v3 0/2] devres: A couple of cleanups Andy Shevchenko
2024-03-01 17:55 ` [PATCH v3 1/2] devres: Switch to use dev_err_probe() for unification Andy Shevchenko
2024-03-01 17:55 ` [PATCH v3 2/2] devres: Don't use "proxy" headers Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).