vserver 1.9.5.x5

[linux-2.6.git] / drivers / pci / hotplug / acpiphp_glue.c

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index d41795b..e7f4129 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -389,7 +389,7 @@ static void add_host_bridge(acpi_handle *handle, int seg, int bus)
 
        bridge->pci_bus = pci_find_bus(seg, bus);
 
-       bridge->res_lock = SPIN_LOCK_UNLOCKED;
+       spin_lock_init(&bridge->res_lock);
 
        /* to be overridden when we decode _CRS */
        bridge->sub = bridge->bus;
@@ -457,7 +457,7 @@ static void add_p2p_bridge(acpi_handle *handle, int seg, int bus, int dev, int f
                return;
        }
 
-       bridge->res_lock = SPIN_LOCK_UNLOCKED;
+       spin_lock_init(&bridge->res_lock);
 
        bridge->bus = bridge->pci_bus->number;
        bridge->sub = bridge->pci_bus->subordinate;
@@ -1301,20 +1301,6 @@ u8 acpiphp_get_power_status(struct acpiphp_slot *slot)
 }
 
 
-/*
- * attention LED ON: 1
- *             OFF: 0
- *
- * TBD
- * no direct attention led status information via ACPI
- *
- */
-u8 acpiphp_get_attention_status(struct acpiphp_slot *slot)
-{
-       return 0;
-}
-
-
 /*
  * latch closed:  1
  * latch   open:  0