[PATCH] PCI: Fix comparison to bool warning in pci.c

[PATCH] PCI: Fix comparison to bool warning in pci.c

[Krzysztof Wilczyński]

Take care about Coccinelle warnings:

  drivers/pci/pci.c:6008:6-12: WARNING: Comparison to bool
  drivers/pci/pci.c:6024:7-13: WARNING: Comparison to bool

No change to functionality intended.

Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
---
 drivers/pci/pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e39c5499770f..487e7214743d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -6005,7 +6005,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
 
 	if (flags & PCI_VGA_STATE_CHANGE_DECODES) {
 		pci_read_config_word(dev, PCI_COMMAND, &cmd);
-		if (decode == true)
+		if (decode)
 			cmd |= command_bits;
 		else
 			cmd &= ~command_bits;
@@ -6021,7 +6021,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
 		if (bridge) {
 			pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
 					     &cmd);
-			if (decode == true)
+			if (decode)
 				cmd |= PCI_BRIDGE_CTL_VGA;
 			else
 				cmd &= ~PCI_BRIDGE_CTL_VGA;
-- 
2.28.0

Re: [PATCH] PCI: Fix comparison to bool warning in pci.c

[Krzysztof Wilczyński]

Hello Bjorn,

This is a trivial patch and I remember you wanted to rename the "decode"
variable to something more meaningful, so I had a look at the
following:

  http://lkml.iu.edu/hypermail/linux/kernel/0908.1/00875.html
  http://lkml.iu.edu/hypermail/linux/kernel/0507.1/1942.html

I also had a look at the "IEEE Std 1275-1994, Standard for Boot
(Initialization Configuration) Firmware, Revision 2.1", but I am still
unsure to what would be a better name for this variable.

Krzysztof

Re: [PATCH] PCI: Fix comparison to bool warning in pci.c

[Bjorn Helgaas]

On Fri, Sep 25, 2020 at 10:45:55PM +0000, Krzysztof Wilczyński wrote:
> Take care about Coccinelle warnings:
> 
>   drivers/pci/pci.c:6008:6-12: WARNING: Comparison to bool
>   drivers/pci/pci.c:6024:7-13: WARNING: Comparison to bool
> 
> No change to functionality intended.
> 
> Signed-off-by: Krzysztof Wilczyński <kw@linux.com>

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

I can't remember why I thought about renaming "decode".

> ---
>  drivers/pci/pci.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index e39c5499770f..487e7214743d 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -6005,7 +6005,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
>  
>  	if (flags & PCI_VGA_STATE_CHANGE_DECODES) {
>  		pci_read_config_word(dev, PCI_COMMAND, &cmd);
> -		if (decode == true)
> +		if (decode)
>  			cmd |= command_bits;
>  		else
>  			cmd &= ~command_bits;
> @@ -6021,7 +6021,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
>  		if (bridge) {
>  			pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
>  					     &cmd);
> -			if (decode == true)
> +			if (decode)
>  				cmd |= PCI_BRIDGE_CTL_VGA;
>  			else
>  				cmd &= ~PCI_BRIDGE_CTL_VGA;
> -- 
> 2.28.0
>