diff options
Diffstat (limited to 'drivers/pci/hotplug/shpchp.h')
-rw-r--r-- | drivers/pci/hotplug/shpchp.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index 8a026f750deb..4d9fed00e1d0 100644 --- a/drivers/pci/hotplug/shpchp.h +++ b/drivers/pci/hotplug/shpchp.h | |||
@@ -69,15 +69,13 @@ struct slot { | |||
69 | u8 state; | 69 | u8 state; |
70 | u8 presence_save; | 70 | u8 presence_save; |
71 | u8 pwr_save; | 71 | u8 pwr_save; |
72 | struct timer_list task_event; | ||
73 | u8 hp_slot; | ||
74 | struct controller *ctrl; | 72 | struct controller *ctrl; |
75 | struct hpc_ops *hpc_ops; | 73 | struct hpc_ops *hpc_ops; |
76 | struct hotplug_slot *hotplug_slot; | 74 | struct hotplug_slot *hotplug_slot; |
77 | struct list_head slot_list; | 75 | struct list_head slot_list; |
78 | char name[SLOT_NAME_SIZE]; | ||
79 | struct delayed_work work; /* work for button event */ | 76 | struct delayed_work work; /* work for button event */ |
80 | struct mutex lock; | 77 | struct mutex lock; |
78 | u8 hp_slot; | ||
81 | }; | 79 | }; |
82 | 80 | ||
83 | struct event_info { | 81 | struct event_info { |
@@ -169,6 +167,11 @@ extern void cleanup_slots(struct controller *ctrl); | |||
169 | extern void shpchp_queue_pushbutton_work(struct work_struct *work); | 167 | extern void shpchp_queue_pushbutton_work(struct work_struct *work); |
170 | extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev); | 168 | extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev); |
171 | 169 | ||
170 | static inline const char *slot_name(struct slot *slot) | ||
171 | { | ||
172 | return hotplug_slot_name(slot->hotplug_slot); | ||
173 | } | ||
174 | |||
172 | #ifdef CONFIG_ACPI | 175 | #ifdef CONFIG_ACPI |
173 | #include <linux/pci-acpi.h> | 176 | #include <linux/pci-acpi.h> |
174 | static inline int get_hp_params_from_firmware(struct pci_dev *dev, | 177 | static inline int get_hp_params_from_firmware(struct pci_dev *dev, |