aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2011-05-27 04:23:00 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-07-22 11:25:35 -0400
commitefe6d7272b1bdb3989322a6f3f9ed063a40c6beb (patch)
treed425f9d6129d9f876ce6103e0f1497c09ce05aec /drivers
parentf483d3923dc3a6394c483e28ccb3fe700bdf399e (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/hotplug/acpi_pcihp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 8f3faf343f75..095f29e13734 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -408,7 +408,7 @@ got_one:
408} 408}
409EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware); 409EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware);
410 410
411static int is_ejectable(acpi_handle handle) 411static int pcihp_is_ejectable(acpi_handle handle)
412{ 412{
413 acpi_status status; 413 acpi_status status;
414 acpi_handle tmp; 414 acpi_handle tmp;
@@ -442,7 +442,7 @@ int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle)
442 return 0; 442 return 0;
443 if (bridge_handle != parent_handle) 443 if (bridge_handle != parent_handle)
444 return 0; 444 return 0;
445 return is_ejectable(handle); 445 return pcihp_is_ejectable(handle);
446} 446}
447EXPORT_SYMBOL_GPL(acpi_pci_check_ejectable); 447EXPORT_SYMBOL_GPL(acpi_pci_check_ejectable);
448 448
@@ -450,7 +450,7 @@ static acpi_status
450check_hotplug(acpi_handle handle, u32 lvl, void *context, void **rv) 450check_hotplug(acpi_handle handle, u32 lvl, void *context, void **rv)
451{ 451{
452 int *found = (int *)context; 452 int *found = (int *)context;
453 if (is_ejectable(handle)) { 453 if (pcihp_is_ejectable(handle)) {
454 *found = 1; 454 *found = 1;
455 return AE_CTRL_TERMINATE; 455 return AE_CTRL_TERMINATE;
456 } 456 }