diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 01:41:48 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 01:41:48 +0100 |
| commit | ace8238b00eafd493b8dbcc7db813ed72b8b6e87 (patch) | |
| tree | 06f6856e7ce4f272eaa686fca5ce3bd33d5df56b | |
| parent | ACPI / hotplug: Simplify device ejection routines (diff) | |
| download | linux-ace8238b00eafd493b8dbcc7db813ed72b8b6e87.tar.xz linux-ace8238b00eafd493b8dbcc7db813ed72b8b6e87.zip | |
ACPI / hotplug: Make acpi_bus_hot_remove_device() internal
Notice that handle_root_bridge_removal() is the only user of
acpi_bus_hot_remove_device(), so it doesn't have to be exported
any more and can be made internal to the ACPI core.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
| -rw-r--r-- | drivers/acpi/internal.h | 1 | ||||
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/scan.c | 1 | ||||
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index ebc3ad0a188d..6c79ae69d344 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -87,6 +87,7 @@ void acpi_device_add_finalize(struct acpi_device *device); void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); int acpi_bind_one(struct device *dev, acpi_handle handle); int acpi_unbind_one(struct device *dev); +void acpi_bus_hot_remove_device(void *context); /* -------------------------------------------------------------------------- Power Resource diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 2c03aaee1006..add408b07c93 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -39,6 +39,8 @@ #include <acpi/acpi_drivers.h> #include <acpi/apei.h> +#include "internal.h" + #define PREFIX "ACPI: " #define _COMPONENT ACPI_PCI_COMPONENT diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index cc19d623a18f..1217ba33f8bf 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -467,7 +467,6 @@ void acpi_bus_hot_remove_device(void *context) { __acpi_bus_hot_remove_device(context, ACPI_NOTIFY_EJECT_REQUEST); } -EXPORT_SYMBOL(acpi_bus_hot_remove_device); static ssize_t real_power_state_show(struct device *dev, struct device_attribute *attr, char *buf) diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 06b644ca052c..eb37a6fb8665 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -386,7 +386,6 @@ int acpi_scan_add_handler(struct acpi_scan_handler *handler); int acpi_bus_register_driver(struct acpi_driver *driver); void acpi_bus_unregister_driver(struct acpi_driver *driver); int acpi_bus_scan(acpi_handle handle); -void acpi_bus_hot_remove_device(void *context); void acpi_bus_trim(struct acpi_device *start); acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); int acpi_match_device_ids(struct acpi_device *device, |