From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Zhang Rui <rui.zhang@intel.com>
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
bhelgaas@google.com, matthew.garrett@nebula.com,
rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com
Subject: Re: [RFC PATCH 6/8] ACPI: use platform bus as the default bus for _HID enumeration
Date: Mon, 03 Mar 2014 00:51:15 +0100 [thread overview]
Message-ID: <22144944.rXupLb1rjo@vostro.rjw.lan> (raw)
In-Reply-To: <1393405874-3266-7-git-send-email-rui.zhang@intel.com>
On Wednesday, February 26, 2014 05:11:12 PM Zhang Rui wrote:
> Because of the growing demand for enumerating ACPI devices to platform bus,
> this patch changes the code to enumerate ACPI devices with _HID/_CID to
> platform bus by default, unless the device already has a scan handler attached.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
> drivers/acpi/acpi_platform.c | 28 ----------------------------
> drivers/acpi/scan.c | 12 ++++++------
> 2 files changed, 6 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> index dbfe49e..33376a9 100644
> --- a/drivers/acpi/acpi_platform.c
> +++ b/drivers/acpi/acpi_platform.c
> @@ -22,24 +22,6 @@
>
> ACPI_MODULE_NAME("platform");
>
> -/*
> - * The following ACPI IDs are known to be suitable for representing as
> - * platform devices.
> - */
> -static const struct acpi_device_id acpi_platform_device_ids[] = {
> -
> - { "PNP0D40" },
> - { "ACPI0003" },
> - { "VPC2004" },
> - { "BCM4752" },
> -
> - /* Intel Smart Sound Technology */
> - { "INT33C8" },
> - { "80860F28" },
> -
> - { }
> -};
> -
> /**
> * acpi_create_platform_device - Create platform device for ACPI device node
> * @adev: ACPI device node to create a platform device for.
> @@ -125,13 +107,3 @@ int acpi_create_platform_device(struct acpi_device *adev,
> kfree(resources);
> return 1;
> }
> -
> -static struct acpi_scan_handler platform_handler = {
> - .ids = acpi_platform_device_ids,
> - .attach = acpi_create_platform_device,
> -};
> -
> -void __init acpi_platform_init(void)
> -{
> - acpi_scan_add_handler(&platform_handler);
> -}
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 5967338..61af32e 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -2022,14 +2022,15 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
> handler = acpi_scan_match_handler(hwid->id, &devid);
> if (handler) {
> ret = handler->attach(device, devid);
> - if (ret > 0) {
> + if (ret > 0)
> device->handler = handler;
> - break;
> - } else if (ret < 0) {
> - break;
> - }
> + if (ret)
> + goto end;
> }
> }
> +end:
> + if (!list_empty(&device->pnp.ids) && !device->handler)
I'm a bit concerned that this check will create platform devices for too many
ACPI device objects. Shouldn't we require that _HID or at least _CID is
present for that?
> + acpi_create_platform_device(device, NULL);
> return ret;
> }
>
> @@ -2185,7 +2186,6 @@ int __init acpi_scan_init(void)
> acpi_pci_root_init();
> acpi_pci_link_init();
> acpi_processor_init();
> - acpi_platform_init();
> acpi_lpss_init();
> acpi_cmos_rtc_init();
> acpi_container_init();
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
next prev parent reply other threads:[~2014-03-02 23:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 9:11 [RFC PATCH 0/8] ACPI: change the way of enumerating PNPACPI/Platform devices Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 1/8] ACPI: introduce .match() callback for ACPI scan handler Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 2/8] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-03-07 1:44 ` Rafael J. Wysocki
2014-03-09 5:29 ` Zhang Rui
2014-03-09 17:49 ` Rafael J. Wysocki
2014-03-10 2:24 ` Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 3/8] PNPACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 4/8] PNPACPI: remove unsupported serial PNP ids from PNPACPI id list Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 5/8] PNPACPI: check and enumerate CMOS RTC devices explicitly Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 6/8] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-03-02 23:51 ` Rafael J. Wysocki [this message]
2014-03-03 14:11 ` Zhang Rui
2014-03-03 23:23 ` Rafael J. Wysocki
2014-03-04 0:27 ` Zhang, Rui
2014-03-04 0:35 ` Rafael J. Wysocki
2014-03-07 1:46 ` Rafael J. Wysocki
2014-03-09 5:33 ` Zhang Rui
2014-03-09 17:50 ` Rafael J. Wysocki
2014-03-09 15:50 ` Zhang Rui
2014-03-09 18:04 ` Rafael J. Wysocki
2014-03-10 2:44 ` Zhang Rui
2014-03-10 2:45 ` Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 7/8] Revert "ACPI / PNP: skip ACPI device nodes associated with physical nodes already" Zhang Rui
2014-02-26 9:11 ` [RFC PATCH 8/8] PNPACPI: create both PNP and Platform device nodes for PNP0C01/PNP0C02 Zhang Rui
2014-03-03 14:17 ` Zhang Rui
2014-03-03 16:17 ` Bjorn Helgaas
2014-02-26 16:47 ` [RFC PATCH 0/8] ACPI: change the way of enumerating PNPACPI/Platform devices Matthew Garrett
2014-03-03 13:50 ` Zhang Rui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=22144944.rXupLb1rjo@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=bhelgaas@google.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).