diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-13 23:58:35 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-16 21:47:59 +0400 |
| commit | 4283c70e91dcabe36f3545afabc5ee2b7d4da34a (patch) | |
| tree | a21257faabcd4bff13e254e4a3c7a3446f2ca459 /drivers/pci/hotplug/pciehp.h | |
| parent | 62e4492c3063048a163d238cd1734273f2fc757d (diff) | |
| download | linux-4283c70e91dcabe36f3545afabc5ee2b7d4da34a.tar.xz | |
PCI: pciehp: Make pcie_wait_cmd() self-contained
pcie_wait_cmd() waits for the controller to finish a hotplug command. Move
the associated logic (to determine whether waiting is required and whether
we're using interrupts or polling) from pcie_write_cmd() to
pcie_wait_cmd().
No functional change.
Tested-by: Rajat Jain <rajatxjain@gmail.com> (IDT 807a controller)
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
| -rw-r--r-- | drivers/pci/hotplug/pciehp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 8e9012dca450..f7bc886c20be 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -92,6 +92,7 @@ struct controller { struct slot *slot; wait_queue_head_t queue; /* sleep & wake process */ u32 slot_cap; + u32 slot_ctrl; struct timer_list poll_timer; unsigned int cmd_busy:1; unsigned int no_cmd_complete:1; |