diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 12:31:34 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 12:31:34 -0400 |
commit | 723ec4d06cb2eed481436cfe008f5f63c45e88fd (patch) | |
tree | e59112af8616e8fbc0cc6c2219b49fd2f05bfc41 /drivers/pci/hotplug/acpiphp.h | |
parent | a3b6bbd5774c13dab89d72f79976ba762913b2f2 (diff) | |
parent | f39d5b72913e2a9ff00ba5ab145ee05a888b1286 (diff) |
Merge branch 'pci/cleanup' into next
* pci/cleanup:
PCI: Remove "extern" from function declarations
PCI: Warn about failures instead of "must_check" functions
PCI: Remove __must_check from definitions
PCI: Remove unused variables
PCI: Move cpci_hotplug_init() proto to header file
PCI: Make local functions/structs static
PCI: Fix missing prototype for pcie_port_acpi_setup()
Conflicts:
drivers/pci/hotplug/acpiphp.h
include/linux/pci.h
Diffstat (limited to 'drivers/pci/hotplug/acpiphp.h')
-rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index 6a319f42b30c..6fdd49c6f0b9 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
@@ -170,21 +170,21 @@ struct acpiphp_attention_info | |||
170 | /* function prototypes */ | 170 | /* function prototypes */ |
171 | 171 | ||
172 | /* acpiphp_core.c */ | 172 | /* acpiphp_core.c */ |
173 | extern int acpiphp_register_attention(struct acpiphp_attention_info*info); | 173 | int acpiphp_register_attention(struct acpiphp_attention_info*info); |
174 | extern int acpiphp_unregister_attention(struct acpiphp_attention_info *info); | 174 | int acpiphp_unregister_attention(struct acpiphp_attention_info *info); |
175 | extern int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot); | 175 | int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot); |
176 | extern void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot); | 176 | void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot); |
177 | 177 | ||
178 | /* acpiphp_glue.c */ | 178 | /* acpiphp_glue.c */ |
179 | typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data); | 179 | typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data); |
180 | 180 | ||
181 | extern int acpiphp_enable_slot (struct acpiphp_slot *slot); | 181 | int acpiphp_enable_slot(struct acpiphp_slot *slot); |
182 | extern int acpiphp_disable_slot (struct acpiphp_slot *slot); | 182 | int acpiphp_disable_slot(struct acpiphp_slot *slot); |
183 | extern int acpiphp_eject_slot (struct acpiphp_slot *slot); | 183 | int acpiphp_eject_slot(struct acpiphp_slot *slot); |
184 | extern u8 acpiphp_get_power_status (struct acpiphp_slot *slot); | 184 | u8 acpiphp_get_power_status(struct acpiphp_slot *slot); |
185 | extern u8 acpiphp_get_attention_status (struct acpiphp_slot *slot); | 185 | u8 acpiphp_get_attention_status(struct acpiphp_slot *slot); |
186 | extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot); | 186 | u8 acpiphp_get_latch_status(struct acpiphp_slot *slot); |
187 | extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot); | 187 | u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot); |
188 | 188 | ||
189 | /* variables */ | 189 | /* variables */ |
190 | extern bool acpiphp_debug; | 190 | extern bool acpiphp_debug; |