aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/hotplug/pciehp.h1
-rw-r--r--drivers/pci/hotplug/pciehp_hpc.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 9e6cec67e1cc..217427a0ead9 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -87,6 +87,7 @@ struct controller {
87 int num_slots; /* Number of slots on ctlr */ 87 int num_slots; /* Number of slots on ctlr */
88 int slot_num_inc; /* 1 or -1 */ 88 int slot_num_inc; /* 1 or -1 */
89 struct pci_dev *pci_dev; 89 struct pci_dev *pci_dev;
90 struct pcie_device *pcie; /* PCI Express port service */
90 struct list_head slot_list; 91 struct list_head slot_list;
91 struct hpc_ops *hpc_ops; 92 struct hpc_ops *hpc_ops;
92 wait_queue_head_t queue; /* sleep & wake process */ 93 wait_queue_head_t queue; /* sleep & wake process */
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 9d934ddee956..5a5c08f12af2 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -223,7 +223,7 @@ static void start_int_poll_timer(struct controller *ctrl, int sec)
223 223
224static inline int pciehp_request_irq(struct controller *ctrl) 224static inline int pciehp_request_irq(struct controller *ctrl)
225{ 225{
226 int retval, irq = ctrl->pci_dev->irq; 226 int retval, irq = ctrl->pcie->irq;
227 227
228 /* Install interrupt polling timer. Start with 10 sec delay */ 228 /* Install interrupt polling timer. Start with 10 sec delay */
229 if (pciehp_poll_mode) { 229 if (pciehp_poll_mode) {
@@ -244,7 +244,7 @@ static inline void pciehp_free_irq(struct controller *ctrl)
244 if (pciehp_poll_mode) 244 if (pciehp_poll_mode)
245 del_timer_sync(&ctrl->poll_timer); 245 del_timer_sync(&ctrl->poll_timer);
246 else 246 else
247 free_irq(ctrl->pci_dev->irq, ctrl); 247 free_irq(ctrl->pcie->irq, ctrl);
248} 248}
249 249
250static int pcie_poll_cmd(struct controller *ctrl) 250static int pcie_poll_cmd(struct controller *ctrl)
@@ -1114,6 +1114,7 @@ struct controller *pcie_init(struct pcie_device *dev)
1114 } 1114 }
1115 INIT_LIST_HEAD(&ctrl->slot_list); 1115 INIT_LIST_HEAD(&ctrl->slot_list);
1116 1116
1117 ctrl->pcie = dev;
1117 ctrl->pci_dev = pdev; 1118 ctrl->pci_dev = pdev;
1118 ctrl->cap_base = pci_find_capability(pdev, PCI_CAP_ID_EXP); 1119 ctrl->cap_base = pci_find_capability(pdev, PCI_CAP_ID_EXP);
1119 if (!ctrl->cap_base) { 1120 if (!ctrl->cap_base) {