aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7c43bdc36abc..d37f290be44c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -127,13 +127,8 @@ void acpi_bus_hot_remove_device(void *context)
127 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 127 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
128 "Hot-removing device %s...\n", dev_name(&device->dev))); 128 "Hot-removing device %s...\n", dev_name(&device->dev)));
129 129
130 if (acpi_bus_trim(device)) { 130 acpi_bus_trim(device);
131 printk(KERN_ERR PREFIX 131 /* Device node has been released. */
132 "Removing device failed\n");
133 goto err_out;
134 }
135
136 /* device has been freed */
137 device = NULL; 132 device = NULL;
138 133
139 /* power off device */ 134 /* power off device */
@@ -1631,7 +1626,7 @@ static acpi_status acpi_bus_remove(acpi_handle handle, u32 lvl_not_used,
1631 return AE_OK; 1626 return AE_OK;
1632} 1627}
1633 1628
1634int acpi_bus_trim(struct acpi_device *start) 1629void acpi_bus_trim(struct acpi_device *start)
1635{ 1630{
1636 /* 1631 /*
1637 * Execute acpi_bus_device_detach() as a post-order callback to detach 1632 * Execute acpi_bus_device_detach() as a post-order callback to detach
@@ -1647,7 +1642,6 @@ int acpi_bus_trim(struct acpi_device *start)
1647 acpi_walk_namespace(ACPI_TYPE_ANY, start->handle, ACPI_UINT32_MAX, NULL, 1642 acpi_walk_namespace(ACPI_TYPE_ANY, start->handle, ACPI_UINT32_MAX, NULL,
1648 acpi_bus_remove, NULL, NULL); 1643 acpi_bus_remove, NULL, NULL);
1649 acpi_bus_remove(start->handle, 0, NULL, NULL); 1644 acpi_bus_remove(start->handle, 0, NULL, NULL);
1650 return 0;
1651} 1645}
1652EXPORT_SYMBOL_GPL(acpi_bus_trim); 1646EXPORT_SYMBOL_GPL(acpi_bus_trim);
1653 1647