summaryrefslogtreecommitdiff
path: root/src/device
diff options
context:
space:
mode:
Diffstat (limited to 'src/device')
-rw-r--r--src/device/pci_device.c15
-rw-r--r--src/device/pciexp_device.c3
2 files changed, 8 insertions, 10 deletions
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 161715fadd..d18b2f110b 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -882,14 +882,15 @@ static struct device_operations *get_pci_bridge_ops(struct device *dev)
case PCI_EXP_TYPE_DOWNSTREAM:
printk(BIOS_DEBUG, "%s subordinate bus PCI Express\n",
dev_path(dev));
-#if CONFIG(PCIEXP_HOTPLUG)
- u16 sltcap;
- sltcap = pci_read_config16(dev, pciexpos + PCI_EXP_SLTCAP);
- if (sltcap & PCI_EXP_SLTCAP_HPC) {
- printk(BIOS_DEBUG, "%s hot-plug capable\n", dev_path(dev));
- return &default_pciexp_hotplug_ops_bus;
+ if (CONFIG(PCIEXP_HOTPLUG)) {
+ u16 sltcap;
+ sltcap = pci_read_config16(dev, pciexpos + PCI_EXP_SLTCAP);
+ if (sltcap & PCI_EXP_SLTCAP_HPC) {
+ printk(BIOS_DEBUG, "%s hot-plug capable\n",
+ dev_path(dev));
+ return &default_pciexp_hotplug_ops_bus;
+ }
}
-#endif /* CONFIG(PCIEXP_HOTPLUG) */
return &default_pciexp_ops_bus;
case PCI_EXP_TYPE_PCI_BRIDGE:
printk(BIOS_DEBUG, "%s subordinate PCI\n",
diff --git a/src/device/pciexp_device.c b/src/device/pciexp_device.c
index 0b7c649d93..70f65144b6 100644
--- a/src/device/pciexp_device.c
+++ b/src/device/pciexp_device.c
@@ -510,8 +510,6 @@ struct device_operations default_pciexp_ops_bus = {
.ops_pci = &pciexp_bus_ops_pci,
};
-#if CONFIG(PCIEXP_HOTPLUG)
-
static void pciexp_hotplug_dummy_read_resources(struct device *dev)
{
struct resource *resource;
@@ -571,4 +569,3 @@ struct device_operations default_pciexp_hotplug_ops_bus = {
.reset_bus = pci_bus_reset,
.ops_pci = &pciexp_bus_ops_pci,
};
-#endif /* CONFIG(PCIEXP_HOTPLUG) */