devres: A couple of cleanups
v2 cover devres: A couple of cleanups
A couple of ad-hoc cleanups. No functional changes intended.
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(-)
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH v2 1/2 devres: Switch to use dev_err_probe() for unification
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.
--- lib/devres.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
lib/devres.c +9 -8
@@ -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;
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
Re: [PATCH v2 1/2] devres: Switch to use dev_err_probe() for unification
Quoted 8 lines · Andy Shevchenko
The devm_*() APIs are supposed to be called during the ->probe() stage.
Many drivers (especially new ones) have switched to usedev_err_probe()
for error messaging for the sake of unification. Let's do the same in the devres APIs.Signed-off-by Andy Shevchenko <[email protected]>
Quoted 63 lines
---
lib/devres.c | 17 +++++++++--------1 file changed, 9 insertions(+), 8 deletions(-)lib/devres.c +1
-0@@ -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); - returnIOMEM_ERR_PTR(-EINVAL);
+ ret =dev_err_probe(dev, -EINVAL, "invalid resource %pR\n", res);
+ returnIOMEM_ERR_PTR(ret);
}
if (type ==DEVM_IOREMAP&&res->flags&IORESOURCE_MEM_NONPOSTED)lib/devres.c +0
-0@@ -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);
- returnIOMEM_ERR_PTR(-ENOMEM);
+ ret =dev_err_probe(dev, -ENOMEM, "can't generate pretty name for resource %pR\n", res);
+ returnIOMEM_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);
- returnIOMEM_ERR_PTR(-EBUSY);
+ ret =dev_err_probe(dev, -EBUSY, "can't request region for resource %pR\n", res);
+ returnIOMEM_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);
+ returnIOMEM_ERR_PTR(ret);
}
returndest_ptr;
PATCH v2 2/2 devres: Don't use "proxy" headers
In reply to Andy ShevchenkoUpdate header inclusions to follow IWYU (Include What You Use) principle.
--- lib/devres.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
lib/devres.c +6 -3
@@ -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 ,
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
Re: [PATCH v2 2/2] devres: Don't use "proxy" headers
Wait a second..
Quoted 2 lines · Andy Shevchenko
Update header inclusions to follow IWYU (Include What You Use) principle.
Hm, what tree is this based on?
Quoted 11 lines
Signed-off-by Andy Shevchenko <[email protected]>---
lib/devres.c | 9 ++++++---1 file changed, 6 insertions(+), 3 deletions(-)lib/devres.c +0
-0
lib/devres.c line 3
Quoted 3 lines
lib/devres.c +1
-0@@ -1,10 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/bug.h> #include <linux/device.h>
Where does device.h come from?
That's not on master, is it? (see below).
Is this based on my PCI-devres series?
Quoted 10 lines
lib/devres.c +5
-3-#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>
Quoted 3 lines
enumdevm_ioremap_type{
DEVM_IOREMAP = 0,
That's what's currently in Linus's master:
// SPDX-License-Identifier: GPL-2.0
#include <linux/err.h>
#include <linux/pci.h>
#include <linux/io.h>
#include <linux/gfp.h>
#include <linux/export.h>
#include <linux/of_address.h>
enum devm_ioremap_type {
P.
Re: [PATCH v2 2/2] devres: Don't use "proxy" headers
Quoted 5 lines · Philipp Stanner
Quoted 2 lines · Andy Shevchenko
Update header inclusions to follow IWYU (Include What You Use) principle.
Hm, what tree is this based on?
Linux next. Seems like I need to rebase on top of driver core. Thanks for catching this!
Signature · 2 lines
With Best Regards, Andy Shevchenko