From patchwork Wed Oct 3 23:00:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/4] ACPI: add drivers_autoprobe in struct acpi_device Date: Wed, 03 Oct 2012 13:00:11 -0000 From: Yinghai Lu X-Patchwork-Id: 188953 Message-Id: <1349305214-3241-2-git-send-email-yinghai@kernel.org> To: Len Brown , Bjorn Helgaas , Greg Kroah-Hartman Cc: Andrew Morton , Linus Torvalds , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu 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 --- 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)