2020-04-26 09:44:13

by Jason Yan

Subject: [PATCH] ray_cs: use true,false for bool variable

Fix the following coccicheck warning:

drivers/net/wireless/ray_cs.c:2797:5-14: WARNING: Comparison of 0/1 to
bool variable
drivers/net/wireless/ray_cs.c:2798:2-11: WARNING: Assignment of 0/1 to
bool variable

Signed-off-by: Jason Yan <[email protected]>
---
drivers/net/wireless/ray_cs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index c1d542bfa530..f9402424accd 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2794,8 +2794,8 @@ static int __init init_ray_cs(void)
proc_create_data("driver/ray_cs/translate", 0200, NULL, &int_proc_ops,
&translate);
#endif
- if (translate != 0)
- translate = 1;
+ if (!translate)
+ translate = true;
return 0;
} /* init_ray_cs */

--
2.21.1

2020-04-26 10:29:24

by Jason Yan

Subject: Re: [PATCH] ray_cs: use true,false for bool variable

在 2020/4/26 17:47, Sergei Shtylyov 写道:
> Hello!
>
> On 26.04.2020 12:41, Jason Yan wrote:
>
>> Fix the following coccicheck warning:
>>
>> drivers/net/wireless/ray_cs.c:2797:5-14: WARNING: Comparison of 0/1 to
>> bool variable
>> drivers/net/wireless/ray_cs.c:2798:2-11: WARNING: Assignment of 0/1 to
>> bool variable
>>
>> Signed-off-by: Jason Yan <[email protected]>
>> ---
>>   drivers/net/wireless/ray_cs.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ray_cs.c
>> b/drivers/net/wireless/ray_cs.c
>> index c1d542bfa530..f9402424accd 100644
>> --- a/drivers/net/wireless/ray_cs.c
>> +++ b/drivers/net/wireless/ray_cs.c
>> @@ -2794,8 +2794,8 @@ static int __init init_ray_cs(void)
>>       proc_create_data("driver/ray_cs/translate", 0200, NULL,
>> &int_proc_ops,
>>                &translate);
>>   #endif
>> -    if (translate != 0)
>> -        translate = 1;
>> +    if (!translate)
>
>    That inverts the original logic, no?

Oh, yes.

>
>> +        translate = true;
>
>    Actually, that whole comparison/assignment doesn't make sense, if we
> use bool...
>

So may be we can do this:

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index c1d542bfa530..9ea695459342 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2794,8 +2794,7 @@ static int __init init_ray_cs(void)
proc_create_data("driver/ray_cs/translate", 0200, NULL,
&int_proc_ops,
&translate);
#endif
- if (translate != 0)
- translate = 1;
+ translate == !!translate;
return 0;
} /* init_ray_cs */

> [...]
>
> MBR, Sergei
>
> .

2020-04-26 10:35:24

by Jason Yan

Subject: Re: [PATCH] ray_cs: use true,false for bool variable

在 2020/4/26 18:27, Jason Yan 写道:
>
>
> 在 2020/4/26 17:47, Sergei Shtylyov 写道:
>> Hello!
>>
>> On 26.04.2020 12:41, Jason Yan wrote:
>>
>>> Fix the following coccicheck warning:
>>>
>>> drivers/net/wireless/ray_cs.c:2797:5-14: WARNING: Comparison of 0/1 to
>>> bool variable
>>> drivers/net/wireless/ray_cs.c:2798:2-11: WARNING: Assignment of 0/1 to
>>> bool variable
>>>
>>> Signed-off-by: Jason Yan <[email protected]>
>>> ---
>>>   drivers/net/wireless/ray_cs.c | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/ray_cs.c
>>> b/drivers/net/wireless/ray_cs.c
>>> index c1d542bfa530..f9402424accd 100644
>>> --- a/drivers/net/wireless/ray_cs.c
>>> +++ b/drivers/net/wireless/ray_cs.c
>>> @@ -2794,8 +2794,8 @@ static int __init init_ray_cs(void)
>>>       proc_create_data("driver/ray_cs/translate", 0200, NULL,
>>> &int_proc_ops,
>>>                &translate);
>>>   #endif
>>> -    if (translate != 0)
>>> -        translate = 1;
>>> +    if (!translate)
>>
>>     That inverts the original logic, no?
>
> Oh, yes.
>
>>
>>> +        translate = true;
>>
>>     Actually, that whole comparison/assignment doesn't make sense, if
>> we use bool...
>>
>
> So may be we can do this:
>
> diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
> index c1d542bfa530..9ea695459342 100644
> --- a/drivers/net/wireless/ray_cs.c
> +++ b/drivers/net/wireless/ray_cs.c
> @@ -2794,8 +2794,7 @@ static int __init init_ray_cs(void)
>         proc_create_data("driver/ray_cs/translate", 0200, NULL,
> &int_proc_ops,
>                          &translate);
>  #endif
> -       if (translate != 0)
> -               translate = 1;
> +       translate == !!translate;

Sorry, this should be:
translate = !!translate;

>         return 0;
>  } /* init_ray_cs */
>
>> [...]
>>
>> MBR, Sergei
>>
>> .
>
>
> .