2021-03-15 07:41:25

by Yang Li

Subject: [PATCH] x86/pci: use true and false for bool variable

fixed the following coccicheck:
./arch/x86/pci/mmconfig-shared.c:464:9-10: WARNING: return of 0/1 in
function 'is_mmconf_reserved' with return type bool
./arch/x86/pci/mmconfig-shared.c:493:5-6: WARNING: return of 0/1 in
function 'is_mmconf_reserved' with return type bool
./arch/x86/pci/mmconfig-shared.c:501:9-10: WARNING: return of 0/1 in
function 'is_mmconf_reserved' with return type bool
./arch/x86/pci/mmconfig-shared.c:522:5-6: WARNING: return of 0/1 in
function 'is_mmconf_reserved' with return type bool

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---
arch/x86/pci/mmconfig-shared.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index de6bf0e..758cbfe 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -461,7 +461,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
}

if (size < (16UL<<20) && size != old_size)
- return 0;
+ return false;

if (dev)
dev_info(dev, "MMCONFIG at %pR reserved in %s\n",
@@ -493,7 +493,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
&cfg->res, (unsigned long) cfg->address);
}

- return 1;
+ return true;
}

static bool __ref
@@ -501,7 +501,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
{
if (!early && !acpi_disabled) {
if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, 0))
- return 1;
+ return true;

if (dev)
dev_info(dev, FW_INFO
@@ -522,14 +522,14 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
* _CBA method, just assume it's reserved.
*/
if (pci_mmcfg_running_state)
- return 1;
+ return true;

/* Don't try to do this check unless configuration
type 1 is available. how about type 2 ?*/
if (raw_pci_ops)
return is_mmconf_reserved(e820__mapped_all, cfg, dev, 1);

- return 0;
+ return false;
}

static void __init pci_mmcfg_reject_broken(int early)
--
1.8.3.1

2021-03-24 07:26:04

by Krzysztof Wilczyński

Subject: Re: [PATCH] x86/pci: use true and false for bool variable

Hi,

Thank you for sending the patch over!

> fixed the following coccicheck:
> ./arch/x86/pci/mmconfig-shared.c:464:9-10: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
> ./arch/x86/pci/mmconfig-shared.c:493:5-6: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
> ./arch/x86/pci/mmconfig-shared.c:501:9-10: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
> ./arch/x86/pci/mmconfig-shared.c:522:5-6: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
[...]

Looks good, although a few small nitpicks: you should capitalise the
subject line so that it matches the style used in previous commits, and
the commit message could also be improved in terms of style and also
explaining what and why this patch is fixing the return type (aside of
just addressing report from Cocinelle).

Other than that,

Reviewed-by: Krzysztof Wilczyński <[email protected]>

Thank you!

Krzysztof

2021-05-28 00:30:07

by Bjorn Helgaas

Subject: Re: [PATCH] x86/pci: use true and false for bool variable

[+cc Krzysztof]

On Mon, Mar 15, 2021 at 03:40:00PM +0800, Yang Li wrote:
> fixed the following coccicheck:
> ./arch/x86/pci/mmconfig-shared.c:464:9-10: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
> ./arch/x86/pci/mmconfig-shared.c:493:5-6: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
> ./arch/x86/pci/mmconfig-shared.c:501:9-10: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
> ./arch/x86/pci/mmconfig-shared.c:522:5-6: WARNING: return of 0/1 in
> function 'is_mmconf_reserved' with return type bool
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Yang Li <[email protected]>

Applied to pci/misc for v5.14, thanks!

Did you check all of drivers/pci/ for similar warnings, too?

> ---
> arch/x86/pci/mmconfig-shared.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
> index de6bf0e..758cbfe 100644
> --- a/arch/x86/pci/mmconfig-shared.c
> +++ b/arch/x86/pci/mmconfig-shared.c
> @@ -461,7 +461,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
> }
>
> if (size < (16UL<<20) && size != old_size)
> - return 0;
> + return false;
>
> if (dev)
> dev_info(dev, "MMCONFIG at %pR reserved in %s\n",
> @@ -493,7 +493,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
> &cfg->res, (unsigned long) cfg->address);
> }
>
> - return 1;
> + return true;
> }
>
> static bool __ref
> @@ -501,7 +501,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
> {
> if (!early && !acpi_disabled) {
> if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, 0))
> - return 1;
> + return true;
>
> if (dev)
> dev_info(dev, FW_INFO
> @@ -522,14 +522,14 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
> * _CBA method, just assume it's reserved.
> */
> if (pci_mmcfg_running_state)
> - return 1;
> + return true;
>
> /* Don't try to do this check unless configuration
> type 1 is available. how about type 2 ?*/
> if (raw_pci_ops)
> return is_mmconf_reserved(e820__mapped_all, cfg, dev, 1);
>
> - return 0;
> + return false;
> }
>
> static void __init pci_mmcfg_reject_broken(int early)
> --
> 1.8.3.1
>