diff options
| author |   Lukas Wunner <lukas@wunner.de> | 2018-09-08 09:59:01 +0200 |
|---|---|---|
| committer |   Bjorn Helgaas <bhelgaas@google.com> | 2018-09-18 17:52:15 -0500 |
| commit | 4ff3126e80fc2db9d961467f783b5c2f4ccd1ca9 (patch) | |
| tree | 94367091a49c52e7b5849c9724b83617a2b88b75 /drivers/pci/hotplug/pciehp.h | |
| parent | PCI: pciehp: Unify controller and slot structs (diff) | |
| download | wireguard-linux-4ff3126e80fc2db9d961467f783b5c2f4ccd1ca9.tar.xz wireguard-linux-4ff3126e80fc2db9d961467f783b5c2f4ccd1ca9.zip | |
PCI: pciehp: Rename controller struct members for clarity
Of the members which were just moved from pciehp's slot struct to the
controller struct, rename "lock" to "state_lock" and rename "work" to
"button_work" for clarity. Perform the rename separately to the
unification of the two structs per Sinan's request.
No functional change intended.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Sinan Kaya <okaya@kernel.org>
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
| -rw-r--r-- | drivers/pci/hotplug/pciehp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index df9308f6dafa..39b97e2384c3 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -87,9 +87,9 @@ do { \ * @pending_events: used by the IRQ handler to save events retrieved from the * Slot Status register for later consumption by the IRQ thread * @state: current state machine position - * @lock: protects reads and writes of @state; - * protects scheduling, execution and cancellation of @work - * @work: work item to turn the slot on or off after 5 seconds + * @state_lock: protects reads and writes of @state; + * protects scheduling, execution and cancellation of @button_work + * @button_work: work item to turn the slot on or off after 5 seconds * in response to an Attention Button press * @hotplug_slot: pointer to the structure registered with the PCI hotplug core * @request_result: result of last user request submitted to the IRQ thread @@ -114,8 +114,8 @@ struct controller { unsigned int power_fault_detected; atomic_t pending_events; u8 state; - struct mutex lock; - struct delayed_work work; + struct mutex state_lock; + struct delayed_work button_work; struct hotplug_slot *hotplug_slot; int request_result; wait_queue_head_t requester; |