diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/shpchp_hpc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c index 3a8186c405f1..45facaad39bd 100644 --- a/drivers/pci/hotplug/shpchp_hpc.c +++ b/drivers/pci/hotplug/shpchp_hpc.c | |||
@@ -211,8 +211,6 @@ | |||
211 | #define SLOT_EVENT_LATCH 0x2 | 211 | #define SLOT_EVENT_LATCH 0x2 |
212 | #define SLOT_SERR_INT_MASK 0x3 | 212 | #define SLOT_SERR_INT_MASK 0x3 |
213 | 213 | ||
214 | static spinlock_t hpc_event_lock; | ||
215 | |||
216 | DEFINE_DBG_BUFFER /* Debug string buffer for entire HPC defined here */ | 214 | DEFINE_DBG_BUFFER /* Debug string buffer for entire HPC defined here */ |
217 | static struct php_ctlr_state_s *php_ctlr_list_head; /* HPC state linked list */ | 215 | static struct php_ctlr_state_s *php_ctlr_list_head; /* HPC state linked list */ |
218 | static int ctlr_seq_num = 0; /* Controller sequenc # */ | 216 | static int ctlr_seq_num = 0; /* Controller sequenc # */ |
@@ -1105,7 +1103,6 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev) | |||
1105 | void *instance_id = ctrl; | 1103 | void *instance_id = ctrl; |
1106 | int rc, num_slots = 0; | 1104 | int rc, num_slots = 0; |
1107 | u8 hp_slot; | 1105 | u8 hp_slot; |
1108 | static int first = 1; | ||
1109 | u32 shpc_base_offset; | 1106 | u32 shpc_base_offset; |
1110 | u32 tempdword, slot_reg, slot_config; | 1107 | u32 tempdword, slot_reg, slot_config; |
1111 | u8 i; | 1108 | u8 i; |
@@ -1167,11 +1164,6 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev) | |||
1167 | ctrl->mmio_size = 0x24 + 0x4 * num_slots; | 1164 | ctrl->mmio_size = 0x24 + 0x4 * num_slots; |
1168 | } | 1165 | } |
1169 | 1166 | ||
1170 | if (first) { | ||
1171 | spin_lock_init(&hpc_event_lock); | ||
1172 | first = 0; | ||
1173 | } | ||
1174 | |||
1175 | info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, pdev->subsystem_vendor, | 1167 | info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, pdev->subsystem_vendor, |
1176 | pdev->subsystem_device); | 1168 | pdev->subsystem_device); |
1177 | 1169 | ||