aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-03 22:35:44 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-04 14:23:40 +0100
commit924144818cf0edc5d9d70d3a44e7cbbf4544796c (patch)
treec58abdcb5a82d4498a856b4e53607857b35926a6
parent53540098b23c3884b4a0b4f220b9d977bc496af3 (diff)
ACPI / glue: Drop .find_bridge() callback from struct acpi_bus_type
After PCI and USB have stopped using the .find_bridge() callback in struct acpi_bus_type, the only remaining user of it is SATA, but SATA only pretends to be a user, because it points that callback to a stub always returning -ENODEV. For this reason, drop the SATA's dummy .find_bridge() callback and remove .find_bridge(), which is not used any more, from struct acpi_bus_type entirely. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/acpi/glue.c26
-rw-r--r--drivers/ata/libata-acpi.c6
-rw-r--r--include/acpi/acpi_bus.h3
3 files changed, 1 insertions, 34 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index b94d14721af..40a84cc6740 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)
return ret;
}
-static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)
-{
- struct acpi_bus_type *tmp;
- int ret = -ENODEV;
-
- down_read(&bus_type_sem);
- list_for_each_entry(tmp, &bus_type_list, list) {
- if (tmp->find_bridge && !tmp->find_bridge(dev, handle)) {
- ret = 0;
- break;
- }
- }
- up_read(&bus_type_sem);
- return ret;
-}
-
static acpi_status do_acpi_find_child(acpi_handle handle, u32 lvl_not_used,
void *addr_p, void **ret_p)
{
@@ -262,15 +246,7 @@ static int acpi_platform_notify(struct device *dev)
int ret;
ret = acpi_bind_one(dev, NULL);
- if (ret) {
- if (!type) {
- ret = acpi_find_bridge_device(dev, &handle);
- if (!ret)
- ret = acpi_bind_one(dev, handle);
-
- goto out;
- }
-
+ if (ret && type) {
ret = type->find_device(dev, &handle);
if (ret) {
DBG("Unable to get handle for %s\n", dev_name(dev));
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index c832a5ca09a..beea3115577 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -1144,14 +1144,8 @@ static int ata_acpi_find_device(struct device *dev, acpi_handle *handle)
return -ENODEV;
}
-static int ata_acpi_find_dummy(struct device *dev, acpi_handle *handle)
-{
- return -ENODEV;
-}
-
static struct acpi_bus_type ata_acpi_bus = {
.name = "ATA",
- .find_bridge = ata_acpi_find_dummy,
.find_device = ata_acpi_find_device,
};
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c751d7de3a5..22ba56e834e 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -439,10 +439,7 @@ struct acpi_bus_type {
struct list_head list;
const char *name;
bool (*match)(struct device *dev);
- /* For general devices under the bus */
int (*find_device) (struct device *, acpi_handle *);
- /* For bridges, such as PCI root bridge, IDE controller */
- int (*find_bridge) (struct device *, acpi_handle *);
void (*setup)(struct device *);
void (*cleanup)(struct device *);
};