lib: Fix some sparse warnings in devres.c
Subsystems (2)
Steven Rostedt
reviewerPATCH 1/1 lib: Fix some sparse warnings in devres.c
Having a discussion about sparse warnings in the kernel, and that we should clean them up, I decided to pick a random file to do so. This happened to be devres.c which gives the following warnings:
CHECK lib/devres.clib/devres.c:83:9: warning: cast removes address space of expression lib/devres.c:117:31: warning: incorrect type in return expression (different address spaces)lib/devres.c:117:31: expected void [noderef] <asn:2>*lib/devres.c:117:31: got void *lib/devres.c:125:31: warning: incorrect type in return expression (different address spaces)lib/devres.c:125:31: expected void [noderef] <asn:2>*lib/devres.c:125:31: got void *lib/devres.c:136:26: warning: incorrect type in assignment (different address spaces)lib/devres.c:136:26: expected void [noderef] <asn:2>*[assigned] dest_ptrlib/devres.c:136:26: got void *lib/devres.c:226:9: warning: cast removes address space of expression
Mostly it's just the use of typecasting to void * without adding __force, or returning ERR_PTR(-ESOMEERR) without typecasting to a __iomem type.
I added a helper macro IOMEM_ERR_PTR() that does the typecast to make the code a little nicer than adding ugly typecasts to the code.
This is applied against linux-next.
lib/devres.c +7 -5
@@ -81,11 +81,13 @@ EXPORT_SYMBOL(devm_ioremap_nocache);void devm_iounmap (struct device *dev,void __iomem *addr) {WARN_ON (devres_destroy (dev, devm_ioremap_release, devm_ioremap_match, - (void *)addr)); + (__force void *)addr));iounmap (addr); }EXPORT_SYMBOL (devm_iounmap); +#define IOMEM_ERR_PTR (err) (__force void __iomem *)ERR_PTR(err) +/** * devm_ioremap_resource() - check, request region, and ioremap resource * @dev: generic device to handle the resource for
@@ -114,7 +116,7 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)if (!res ||resource_type (res) !=IORESOURCE_MEM ) {dev_err (dev,"invalid resource\n" ); -return ERR_PTR (-EINVAL ); +return IOMEM_ERR_PTR (-EINVAL ); } size =resource_size (res);
@@ -122,7 +124,7 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)if (!devm_request_mem_region (dev, res->start, size, name)) {dev_err (dev,"can't request region for resource %pR\n" , res); -return ERR_PTR (-EBUSY ); +return IOMEM_ERR_PTR (-EBUSY ); }if (res->flags &IORESOURCE_CACHEABLE )
@@ -133,7 +135,7 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)if (!dest_ptr) {dev_err (dev,"ioremap failed for resource %pR\n" , res);devm_release_mem_region (dev, res->start, size); - dest_ptr =ERR_PTR (-ENOMEM ); + dest_ptr =IOMEM_ERR_PTR (-ENOMEM ); }return dest_ptr;
@@ -224,7 +226,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr) {ioport_unmap (addr);WARN_ON (devres_destroy (dev, devm_ioport_map_release, - devm_ioport_map_match, (void *)addr)); + devm_ioport_map_match, (__force void *)addr)); }EXPORT_SYMBOL (devm_ioport_unmap);#endif /* CONFIG_HAS_IOPORT */
PATCH 1/1 sched/wait: suppress sparse 'variable shadowing' warning
From: Johannes Berg <[email protected]>
This warning seems to show up a lot now, since ___wait_event() is (indirectly) used inside wait_event_timeout(), which also has a variable called __ret. Rename the one in ___wait_event() to ___ret (another leading underscore) to suppress the warning.
--- include/linux/wait.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/wait.h +3 -3
@@ -195,7 +195,7 @@ wait_queue_head_t *bit_waitqueue(void *, int); ({ \ __label__ __out; \ wait_queue_t __wait; \ - long __ret = ret; \ + long ___ret = ret; \ \ INIT_LIST_HEAD(&__wait.task_list); \ if (exclusive) \
@@ -210,7 +210,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);break ; \ \if (___wait_is_interruptible (state) && __int) { \ - __ret = __int; \ + ___ret = __int; \if (exclusive) { \abort_exclusive_wait (&wq, &__wait, \ state,NULL ); \
@@ -222,7 +222,7 @@ wait_queue_head_t *bit_waitqueue(void *, int); cmd; \ } \finish_wait (&wq, &__wait); \ -__out: __ret; \ +__out: ___ret; \ })#define __wait_event (wq, condition) \
Signature · 1 line
1.8.5.3
Peter Zijlstra
maintainerRe: [PATCH] sched/wait: suppress sparse 'variable shadowing' warning
Quoted 8 lines · Johannes Berg
From: Johannes Berg <[email protected]>
This warning seems to show up a lot now, since
___wait_event()is (indirectly) used insidewait_event_timeout(), which also has a variable called__ret. Rename the one in___wait_event()to___ret(another leading underscore) to suppress the warning.Signed-off-by Johannes Berg <[email protected]>
Thanks!
Steven Rostedt
reviewerRe: [PATCH] sched/wait: suppress sparse 'variable shadowing' warning
Quoted 11 lines · On Thu, 6 Feb 2014 17:45:58 +0100 Peter Zijlstra <[email protected]> wrote:
Quoted 8 lines · Johannes Berg
From: Johannes Berg <[email protected]>
This warning seems to show up a lot now, since
___wait_event()is (indirectly) used insidewait_event_timeout(), which also has a variable called__ret. Rename the one in___wait_event()to___ret(another leading underscore) to suppress the warning.Signed-off-by Johannes Berg <[email protected]>Thanks!
Tag, you're it!
Now you need to submit a patch to fix one sparse warning this week ;-)
Yeah, yeah, I know. Like you have time.
This could be a cool drinking game. Every time you fix someone else's sparse error, they have to drink a pint :-)
-- Steve
Re: [PATCH] sched/wait: suppress sparse 'variable shadowing' warning
Quoted 15 lines · Steven Rostedt
Quoted 11 lines · On Thu, 6 Feb 2014 17:45:58 +0100 Peter Zijlstra <[email protected]> wrote:
Quoted 8 lines · Johannes Berg
From: Johannes Berg <[email protected]>
This warning seems to show up a lot now, since
___wait_event()is (indirectly) used insidewait_event_timeout(), which also has a variable called__ret. Rename the one in___wait_event()to___ret(another leading underscore) to suppress the warning.Signed-off-by Johannes Berg <[email protected]>Thanks!
Quoted 8 lines
Tag, you're it!
Now you need to submit a patch to fix one sparse warning this week ;-)
Yeah, yeah, I know. Like you have time.
This could be a cool drinking game. Every time you fix someone else's sparse error, they have to drink a pint :-)
... which game would result in a heightened mood amongst developers and even more Sparse errors, resulting in more fixes from PeterZ and more pints downed, creating a nice feedback loop. Sounds like fun for everyone, except Peter? ;-)
Thanks,
Ingo
tip-bot for Johannes Berg
merge bot[tip:core/locking] sched/wait: Suppress Sparse ' variable shadowing' warning
In reply to Johannes Bergsched/wait: Suppress Sparse 'variable shadowing' warning
Commit-ID: 980f88e414418bf65569a3b62b08b07e6fc2f4c6 Gitweb: http://git.kernel.org/tip/980f88e414418bf65569a3b62b08b07e6fc2f4c6 Author: Johannes Berg <[email protected]> AuthorDate: Thu, 6 Feb 2014 17:28:41 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 9 Feb 2014 13:11:49 +0100
sched/wait: Suppress Sparse 'variable shadowing' warning
This warning seems to show up a lot now, since ___wait_event() is (indirectly) used inside wait_event_timeout(), which also has a variable called __ret. Rename the one in ___wait_event() to ___ret (another leading underscore) to suppress the warning.
--- include/linux/wait.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/wait.h +3 -3
@@ -195,7 +195,7 @@ wait_queue_head_t *bit_waitqueue(void *, int); ({ \ __label__ __out; \ wait_queue_t __wait; \ - long __ret = ret; \ + long ___ret = ret; \ \ INIT_LIST_HEAD(&__wait.task_list); \ if (exclusive) \
@@ -210,7 +210,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);break ; \ \if (___wait_is_interruptible (state) && __int) { \ - __ret = __int; \ + ___ret = __int; \if (exclusive) { \abort_exclusive_wait (&wq, &__wait, \ state,NULL ); \
@@ -222,7 +222,7 @@ wait_queue_head_t *bit_waitqueue(void *, int); cmd; \ } \finish_wait (&wq, &__wait); \ -__out: __ret; \ +__out: ___ret; \ })#define __wait_event (wq, condition) \
Quoted 21 lines · Steven Rostedt
Having a discussion about sparse warnings in the kernel, and that we should clean them up, I decided to pick a random file to do so. This happened to be
devres.cwhich gives the following warnings:CHECK
lib/devres.clib/devres.c:83:9: warning: cast removes address space of expressionlib/devres.c:117:31: warning: incorrect type in return expression (different address spaces)lib/devres.c:117:31: expected void [noderef] <asn:2>*lib/devres.c:117:31: got void *lib/devres.c:125:31: warning: incorrect type in return expression (different address spaces)lib/devres.c:125:31: expected void [noderef] <asn:2>*lib/devres.c:125:31: got void *lib/devres.c:136:26: warning: incorrect type in assignment (different address spaces)lib/devres.c:136:26: expected void [noderef] <asn:2>*[assigned]dest_ptrlib/devres.c:136:26: got void *lib/devres.c:226:9: warning: cast removes address space of expressionMostly it's just the use of typecasting to void * without adding
__force, or returningERR_PTR(-ESOMEERR)without typecasting to a__iomemtype.
Quoted 6 lines
I added a helper macro
IOMEM_ERR_PTR()that does the typecast to make the code a little nicer than adding ugly typecasts to the code.This is applied against linux-next.
Signed-off-by Steven Rostedt <[email protected]>