[coreboot-gerrit] Change in coreboot[master]: device/pci: Replace add with bitwise-or

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35517 )

Change subject: device/pci: Replace add with bitwise-or
......................................................................

device/pci: Replace add with bitwise-or

Change-Id: I9fbefac3bef7425d6f5ea1bcc01eb21485315c36
Signed-off-by: Kyösti Mälkki 
---
M src/device/cardbus_device.c
M src/device/pci_device.c
M src/southbridge/intel/bd82x6x/pci.c
M src/southbridge/intel/i82801gx/pci.c
4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/35517/1

diff --git a/src/device/cardbus_device.c b/src/device/cardbus_device.c
index a440746..4b24c54 100644
--- a/src/device/cardbus_device.c
+++ b/src/device/cardbus_device.c
@@ -159,7 +159,7 @@
    		PCI_BRIDGE_CTL_MASTER_ABORT |
    		PCI_BRIDGE_CTL_BUS_RESET));
    /* Error check */
-	ctrl |= (PCI_CB_BRIDGE_CTL_PARITY + PCI_CB_BRIDGE_CTL_SERR);
+	ctrl |= (PCI_CB_BRIDGE_CTL_PARITY | PCI_CB_BRIDGE_CTL_SERR);
    printk(BIOS_DEBUG, "%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
    pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 7ecb652..c043dd6 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -626,7 +626,7 @@
    	dev->command |= PCI_COMMAND_IO;
    ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
    ctrl |= dev->link_list->bridge_ctrl;
-	ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* Error check. */
+	ctrl |= (PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR); /* Error check. */
    printk(BIOS_DEBUG, "%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
    pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);

diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c
index 2186287..6391de4 100644
--- a/src/southbridge/intel/bd82x6x/pci.c
+++ b/src/southbridge/intel/bd82x6x/pci.c
@@ -77,7 +77,7 @@
    	dev->command |= PCI_COMMAND_IO;
    ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
    ctrl |= dev->link_list->bridge_ctrl;
-	ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* error check */
+	ctrl |= (PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR); /* error check */
    printk(BIOS_DEBUG, "%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
    pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);

diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c
index 22c5165..1d1f902 100644
--- a/src/southbridge/intel/i82801gx/pci.c
+++ b/src/southbridge/intel/i82801gx/pci.c
@@ -76,7 +76,7 @@
    	dev->command |= PCI_COMMAND_IO;
    ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
    ctrl |= dev->link_list->bridge_ctrl;
-	ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* error check */
+	ctrl |= (PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR); /* error check */
    printk(BIOS_DEBUG, "%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
    pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);