mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 13:11:40 +00:00
PCI hotplug: Rename is_ejectable which also exists in dock.c
While it's declared static, etags points you to the wrong function in drivers/acpi/dock.c and acpiphp_glue.c for example also makes use of some (exported..) functions from this file. If you trust etags and oversee the static declaration (what happened to me) one gets totally confused... Signed-off-by: Thomas Renninger <trenn@suse.de> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
f483d3923d
commit
efe6d7272b
@ -408,7 +408,7 @@ got_one:
|
||||
}
|
||||
EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware);
|
||||
|
||||
static int is_ejectable(acpi_handle handle)
|
||||
static int pcihp_is_ejectable(acpi_handle handle)
|
||||
{
|
||||
acpi_status status;
|
||||
acpi_handle tmp;
|
||||
@ -442,7 +442,7 @@ int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle)
|
||||
return 0;
|
||||
if (bridge_handle != parent_handle)
|
||||
return 0;
|
||||
return is_ejectable(handle);
|
||||
return pcihp_is_ejectable(handle);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_pci_check_ejectable);
|
||||
|
||||
@ -450,7 +450,7 @@ static acpi_status
|
||||
check_hotplug(acpi_handle handle, u32 lvl, void *context, void **rv)
|
||||
{
|
||||
int *found = (int *)context;
|
||||
if (is_ejectable(handle)) {
|
||||
if (pcihp_is_ejectable(handle)) {
|
||||
*found = 1;
|
||||
return AE_CTRL_TERMINATE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user