aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/glue.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/glue.c')
-rw-r--r--drivers/acpi/glue.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index b94d14721af3..40a84cc6740c 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -78,22 +78,6 @@ static struct acpi_bus_type *acpi_get_bus_type(struct device *dev)
78 return ret; 78 return ret;
79} 79}
80 80
81static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)
82{
83 struct acpi_bus_type *tmp;
84 int ret = -ENODEV;
85
86 down_read(&bus_type_sem);
87 list_for_each_entry(tmp, &bus_type_list, list) {
88 if (tmp->find_bridge && !tmp->find_bridge(dev, handle)) {
89 ret = 0;
90 break;
91 }
92 }
93 up_read(&bus_type_sem);
94 return ret;
95}
96
97static acpi_status do_acpi_find_child(acpi_handle handle, u32 lvl_not_used, 81static acpi_status do_acpi_find_child(acpi_handle handle, u32 lvl_not_used,
98 void *addr_p, void **ret_p) 82 void *addr_p, void **ret_p)
99{ 83{
@@ -262,15 +246,7 @@ static int acpi_platform_notify(struct device *dev)
262 int ret; 246 int ret;
263 247
264 ret = acpi_bind_one(dev, NULL); 248 ret = acpi_bind_one(dev, NULL);
265 if (ret) { 249 if (ret && type) {
266 if (!type) {
267 ret = acpi_find_bridge_device(dev, &handle);
268 if (!ret)
269 ret = acpi_bind_one(dev, handle);
270
271 goto out;
272 }
273
274 ret = type->find_device(dev, &handle); 250 ret = type->find_device(dev, &handle);
275 if (ret) { 251 if (ret) {
276 DBG("Unable to get handle for %s\n", dev_name(dev)); 252 DBG("Unable to get handle for %s\n", dev_name(dev));