2019-04-06 08:45:55

by Nicholas Mc Guire

Subject: [PATCH V2] staging: wilc1000: drop explicit conversion to bool

As the expression evaluates to a boolean anyway (relational and logical
operators) conversion with the ternary operator is not needed here as
coccinelle notes (boolconv.cocci)

Signed-off-by: Nicholas Mc Guire <[email protected]>
---

V2: sent out the wrong version - the commit message was longer than 75
chars - only change here is the commit message wrapping.

scripts/coccinelle/misc/boolconv.cocci warned about:
drivers/staging/wilc1000/wilc_wlan.c:14:48-53: WARNING: conversion to bool not needed here

Patch was compile tested with: x86_64_defconfig + Staging=y,
WILC1000_SDIO=m, WILC1000_SPI=m, WILC1000=m
(checkpatch, sparse and cocci clean otherwise)

Patch is against 5.1-rc3 (localversion-next is -next-20190403)

drivers/staging/wilc1000/wilc_wlan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index c238969..6c9fd3a 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -11,7 +11,7 @@

static inline bool is_wilc1000(u32 id)
{
- return ((id & 0xfffff000) == 0x100000 ? true : false);
+ return ((id & 0xfffff000) == 0x100000);
}

static inline void acquire_bus(struct wilc *wilc, enum bus_acquire acquire)
--
2.1.4

2019-04-06 09:12:13

by Julian Calaby

Subject: Re: [PATCH V2] staging: wilc1000: drop explicit conversion to bool

Hi Nicholas,

On Sat, Apr 6, 2019 at 7:48 PM Nicholas Mc Guire <[email protected]> wrote:
>
> As the expression evaluates to a boolean anyway (relational and logical
> operators) conversion with the ternary operator is not needed here as
> coccinelle notes (boolconv.cocci)
>
> Signed-off-by: Nicholas Mc Guire <[email protected]>
> ---
>
> V2: sent out the wrong version - the commit message was longer than 75
> chars - only change here is the commit message wrapping.
>
> scripts/coccinelle/misc/boolconv.cocci warned about:
> drivers/staging/wilc1000/wilc_wlan.c:14:48-53: WARNING: conversion to bool not needed here
>
> Patch was compile tested with: x86_64_defconfig + Staging=y,
> WILC1000_SDIO=m, WILC1000_SPI=m, WILC1000=m
> (checkpatch, sparse and cocci clean otherwise)
>
> Patch is against 5.1-rc3 (localversion-next is -next-20190403)
>
> drivers/staging/wilc1000/wilc_wlan.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
> index c238969..6c9fd3a 100644
> --- a/drivers/staging/wilc1000/wilc_wlan.c
> +++ b/drivers/staging/wilc1000/wilc_wlan.c
> @@ -11,7 +11,7 @@
>
> static inline bool is_wilc1000(u32 id)
> {
> - return ((id & 0xfffff000) == 0x100000 ? true : false);
> + return ((id & 0xfffff000) == 0x100000);

Whilst you're here, you might as well remove the superfluous parentheses.

Other than that,

Reviewed-by: Julian Calaby <[email protected]>

Thanks,

--
Julian Calaby

Email: [email protected]
Profile: http://www.google.com/profiles/julian.calaby/

2019-04-06 09:43:25

by Nicholas Mc Guire

Subject: Re: [PATCH V2] staging: wilc1000: drop explicit conversion to bool

On Sat, Apr 06, 2019 at 08:11:55PM +1100, Julian Calaby wrote:
> Hi Nicholas,
>
> On Sat, Apr 6, 2019 at 7:48 PM Nicholas Mc Guire <[email protected]> wrote:
> >
> > As the expression evaluates to a boolean anyway (relational and logical
> > operators) conversion with the ternary operator is not needed here as
> > coccinelle notes (boolconv.cocci)
> >
> > Signed-off-by: Nicholas Mc Guire <[email protected]>
> > ---
> >
> > V2: sent out the wrong version - the commit message was longer than 75
> > chars - only change here is the commit message wrapping.
> >
> > scripts/coccinelle/misc/boolconv.cocci warned about:
> > drivers/staging/wilc1000/wilc_wlan.c:14:48-53: WARNING: conversion to bool not needed here
> >
> > Patch was compile tested with: x86_64_defconfig + Staging=y,
> > WILC1000_SDIO=m, WILC1000_SPI=m, WILC1000=m
> > (checkpatch, sparse and cocci clean otherwise)
> >
> > Patch is against 5.1-rc3 (localversion-next is -next-20190403)
> >
> > drivers/staging/wilc1000/wilc_wlan.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
> > index c238969..6c9fd3a 100644
> > --- a/drivers/staging/wilc1000/wilc_wlan.c
> > +++ b/drivers/staging/wilc1000/wilc_wlan.c
> > @@ -11,7 +11,7 @@
> >
> > static inline bool is_wilc1000(u32 id)
> > {
> > - return ((id & 0xfffff000) == 0x100000 ? true : false);
> > + return ((id & 0xfffff000) == 0x100000);
>
> Whilst you're here, you might as well remove the superfluous parentheses.
>

fine - there are a few other places though that this would need to be cleaned
up to be consistent e.g. entries = ((reg >> 3) & 0x3f); wilc_wlan.c

> Other than that,
>
> Reviewed-by: Julian Calaby <[email protected]>
>

will resend with outer () dropped and Reviewed-by: added

thx!
hofrat

> Thanks,
>
> --
> Julian Calaby
>
> Email: [email protected]
> Profile: http://www.google.com/profiles/julian.calaby/