[PATCH 1/4] ACPI: add drivers_autoprobe in struct acpi_device

From: Yinghai Lu
Date: Wed Oct 03 2012 - 19:00:19 EST


To use to control the delay attach driver for acpi_device.

Will use bus notifier to toggle this bits when needed.

Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
---
drivers/acpi/scan.c | 8 +++++++-
include/acpi/acpi_bus.h | 1 +
2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index d1ecca2..cbb3ed1 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -333,7 +333,12 @@ static void acpi_device_release(struct device *dev)
static int acpi_bus_match(struct device *dev, struct device_driver *drv)
{
struct acpi_device *acpi_dev = to_acpi_device(dev);
- struct acpi_driver *acpi_drv = to_acpi_driver(drv);
+ struct acpi_driver *acpi_drv;
+
+ if (!acpi_dev->drivers_autoprobe)
+ return 0;
+
+ acpi_drv = to_acpi_driver(drv);

return !acpi_match_device_ids(acpi_dev, acpi_drv->ids);
}
@@ -1268,6 +1273,7 @@ static int acpi_add_single_object(struct acpi_device **child,
device->parent = acpi_bus_get_parent(handle);
device->bus_ops = *ops; /* workround for not call .start */
STRUCT_TO_INT(device->status) = sta;
+ device->drivers_autoprobe = true;

acpi_device_get_busid(device);

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index bde976e..969544e 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -304,6 +304,7 @@ struct acpi_device {
struct device dev;
struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */
enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
+ bool drivers_autoprobe;
};

static inline void *acpi_driver_data(struct acpi_device *d)
--
1.7.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/