aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/broadwell/pch/pch.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel/broadwell/pch/pch.c')
-rw-r--r--src/soc/intel/broadwell/pch/pch.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/soc/intel/broadwell/pch/pch.c b/src/soc/intel/broadwell/pch/pch.c
index e0c5bb0c4d..d4b88f1a0b 100644
--- a/src/soc/intel/broadwell/pch/pch.c
+++ b/src/soc/intel/broadwell/pch/pch.c
@@ -168,8 +168,6 @@ void pch_disable_devfn(struct device *dev)
static void broadwell_pch_enable_dev(struct device *dev)
{
- u16 reg16;
-
if (dev->path.type != DEVICE_PATH_PCI)
return;
@@ -188,10 +186,8 @@ static void broadwell_pch_enable_dev(struct device *dev)
printk(BIOS_DEBUG, "%s: Disabling device\n", dev_path(dev));
/* Ensure memory, io, and bus master are all disabled */
- reg16 = pci_read_config16(dev, PCI_COMMAND);
- reg16 &= ~(PCI_COMMAND_MASTER |
- PCI_COMMAND_MEMORY | PCI_COMMAND_IO);
- pci_write_config16(dev, PCI_COMMAND, reg16);
+ pci_and_config16(dev, PCI_COMMAND,
+ ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
/* Disable this device if possible */
pch_disable_devfn(dev);