From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
linux-pci@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>,
Toshi Kani <toshi.kani@hp.com>,
Myron Stowe <myron.stowe@redhat.com>
Subject: [PATCH 3/6] ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different
Date: Mon, 10 Dec 2012 00:01:41 +0100 [thread overview]
Message-ID: <1693581.lT8eSoGRfL@vostro.rjw.lan> (raw)
In-Reply-To: <8498184.VilrUmatxI@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
The current ACPI namespace scanning code suggests that acpi_bus_add()
and acpi_bus_start() share some code. In fact, however, they are
completely different code paths, so refactor the code to make that
distinction visibly clear.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/scan.c | 57 ++++++++++++++++++++++++----------------------------
1 file changed, 27 insertions(+), 30 deletions(-)
Index: linux/drivers/acpi/scan.c
===================================================================
--- linux.orig/drivers/acpi/scan.c
+++ linux/drivers/acpi/scan.c
@@ -1626,28 +1626,22 @@ static acpi_status acpi_bus_check_add(ac
return AE_OK;
}
-static acpi_status acpi_bus_probe_start(acpi_handle handle, u32 lvl,
- void *context, void **not_used)
+static acpi_status acpi_bus_match_device(acpi_handle handle, u32 lvl,
+ void *not_used, void **ret_not_used)
{
- struct acpi_bus_ops *ops = context;
struct acpi_device *device;
acpi_status status = AE_OK;
if (acpi_bus_get_device(handle, &device))
return AE_CTRL_DEPTH;
- if (ops->acpi_op_add) {
- if (!acpi_match_device_ids(device, acpi_platform_device_ids)) {
- /* This is a known good platform device. */
- acpi_create_platform_device(device);
- } else {
- int ret = device_attach(&device->dev);
- acpi_hot_add_bind(device);
- if (ret)
- status = AE_CTRL_DEPTH;
- }
- } else if (ops->acpi_op_start) {
- if (ACPI_FAILURE(acpi_start_single_object(device)))
+ if (!acpi_match_device_ids(device, acpi_platform_device_ids)) {
+ /* This is a known good platform device. */
+ acpi_create_platform_device(device);
+ } else {
+ int ret = device_attach(&device->dev);
+ acpi_hot_add_bind(device);
+ if (ret)
status = AE_CTRL_DEPTH;
}
return status;
@@ -1670,7 +1664,7 @@ static int acpi_bus_scan(acpi_handle han
acpi_bus_check_add, NULL, ops, &device);
if (device)
acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
- acpi_bus_probe_start, NULL, ops, NULL);
+ acpi_bus_match_device, NULL, NULL, NULL);
else
ret = -ENODEV;
@@ -1697,31 +1691,34 @@ int
acpi_bus_add(struct acpi_device **child,
struct acpi_device *parent, acpi_handle handle, int type)
{
- struct acpi_bus_ops ops;
-
- memset(&ops, 0, sizeof(ops));
- ops.acpi_op_add = 1;
+ struct acpi_bus_ops ops = { .acpi_op_add = 1, };
return acpi_bus_scan(handle, &ops, child);
}
EXPORT_SYMBOL(acpi_bus_add);
-int acpi_bus_start(struct acpi_device *device)
+static acpi_status acpi_bus_start_device(acpi_handle handle, u32 lvl,
+ void *not_used, void **ret_not_used)
{
- struct acpi_bus_ops ops;
- int result;
+ struct acpi_device *device;
+ acpi_status status;
- if (!device)
- return -EINVAL;
+ if (acpi_bus_get_device(handle, &device))
+ return AE_CTRL_DEPTH;
- memset(&ops, 0, sizeof(ops));
- ops.acpi_op_start = 1;
+ status = acpi_start_single_object(device);
+ return ACPI_SUCCESS(status) ? status : AE_CTRL_DEPTH;
+}
- result = acpi_bus_scan(device->handle, &ops, NULL);
+int acpi_bus_start(struct acpi_device *device)
+{
+ if (!device)
+ return -EINVAL;
+ acpi_walk_namespace(ACPI_TYPE_ANY, device->handle, ACPI_UINT32_MAX,
+ acpi_bus_start_device, NULL, NULL, NULL);
acpi_update_all_gpes();
-
- return result;
+ return 0;
}
EXPORT_SYMBOL(acpi_bus_start);
next prev parent reply other threads:[~2012-12-09 23:01 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-09 22:58 [PATCH 0/6] ACPI: Change the ACPI namespace scanning code ordering Rafael J. Wysocki
2012-12-09 23:00 ` [PATCH 1/6] ACPI: Separate adding ACPI device objects from probing ACPI drivers Rafael J. Wysocki
2012-12-12 15:50 ` Jiang Liu
2012-12-12 22:34 ` Rafael J. Wysocki
2012-12-12 16:38 ` Jiang Liu
2012-12-12 22:32 ` Rafael J. Wysocki
2012-12-12 23:43 ` [update][PATCH " Rafael J. Wysocki
2012-12-13 13:05 ` [PATCH " Jiang Liu
2012-12-13 19:40 ` Rafael J. Wysocki
2012-12-13 1:00 ` Bjorn Helgaas
2012-12-13 11:41 ` Rafael J. Wysocki
2012-12-09 23:00 ` [PATCH 2/6] ACPI: Change the ordering of PCI root bridge driver registrarion Rafael J. Wysocki
2012-12-13 1:00 ` Bjorn Helgaas
2012-12-13 12:19 ` Rafael J. Wysocki
2012-12-09 23:01 ` Rafael J. Wysocki [this message]
2012-12-13 0:11 ` [Update][PATCH 3/6] ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different Rafael J. Wysocki
2012-12-09 23:02 ` [PATCH 4/6] ACPI: Reduce the usage of struct acpi_bus_ops Rafael J. Wysocki
2012-12-09 23:03 ` [PATCH 5/6] ACPI: Replace struct acpi_bus_ops with enum type Rafael J. Wysocki
2012-12-10 5:34 ` Yinghai Lu
2012-12-10 14:46 ` Rafael J. Wysocki
2012-12-10 17:07 ` Yinghai Lu
2012-12-10 22:47 ` Rafael J. Wysocki
2012-12-10 23:09 ` Rafael J. Wysocki
2012-12-10 23:14 ` Yinghai Lu
2012-12-11 1:02 ` Rafael J. Wysocki
2012-12-11 1:28 ` Rafael J. Wysocki
2012-12-11 2:26 ` Yinghai Lu
2012-12-11 12:45 ` Rafael J. Wysocki
2012-12-11 15:09 ` Jiang Liu
2012-12-11 18:30 ` Rafael J. Wysocki
2012-12-12 14:34 ` Yijing Wang
2012-12-12 15:05 ` Jiang Liu
2012-12-12 22:39 ` Rafael J. Wysocki
2012-12-10 23:22 ` Yinghai Lu
2012-12-11 0:48 ` Rafael J. Wysocki
2012-12-09 23:04 ` [PATCH 6/6] ACPI: Change the ordering of acpi_bus_check_add() Rafael J. Wysocki
2012-12-13 1:00 ` Bjorn Helgaas
2012-12-13 12:20 ` Rafael J. Wysocki
2012-12-13 11:45 ` [PATCH 0/6] ACPI: Change the ACPI namespace scanning code ordering Yijing Wang
2012-12-13 22:15 ` [PATCH rev.2 " Rafael J. Wysocki
2012-12-13 22:17 ` [PATCH rev.2 1/6] ACPI: Separate adding ACPI device objects from probing ACPI drivers Rafael J. Wysocki
2012-12-18 0:08 ` Toshi Kani
2012-12-18 1:48 ` Rafael J. Wysocki
2012-12-18 16:10 ` Toshi Kani
2012-12-18 18:59 ` Yinghai Lu
2012-12-18 20:48 ` Toshi Kani
2012-12-18 21:11 ` Yinghai Lu
2012-12-18 22:05 ` Rafael J. Wysocki
2012-12-19 1:57 ` Yinghai Lu
2012-12-18 21:57 ` Rafael J. Wysocki
2012-12-18 22:15 ` Toshi Kani
2012-12-18 23:00 ` Rafael J. Wysocki
2012-12-18 23:19 ` Bjorn Helgaas
2012-12-19 11:13 ` Rafael J. Wysocki
2012-12-20 1:45 ` [PATCH 0/16] ACPI: Rework ACPI namespace scanning for devices Rafael J. Wysocki
2012-12-20 1:47 ` [PATCH 1/16] ACPI: Separate adding ACPI device objects from probing ACPI drivers Rafael J. Wysocki
2013-01-11 20:00 ` Mika Westerberg
2013-01-11 20:31 ` Rafael J. Wysocki
2013-01-11 20:37 ` Mika Westerberg
2013-01-11 20:58 ` Rafael J. Wysocki
2013-01-11 20:59 ` Mika Westerberg
2012-12-20 1:48 ` [PATCH 2/16] ACPI: Change the ordering of PCI root bridge driver registrarion Rafael J. Wysocki
2012-12-20 1:49 ` [PATCH 3/16] ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different Rafael J. Wysocki
2012-12-20 1:50 ` [PATCH 4/16] ACPI: Reduce the usage of struct acpi_bus_ops Rafael J. Wysocki
2012-12-20 1:50 ` [PATCH 5/16] ACPI: Replace struct acpi_bus_ops with enum type Rafael J. Wysocki
2012-12-20 1:51 ` [PATCH 6/16] ACPI: Change the ordering of acpi_bus_check_add() Rafael J. Wysocki
2012-12-20 1:52 ` [PATCH 7/16] ACPI / PCI: Fold acpi_pci_root_start() into acpi_pci_root_add() Rafael J. Wysocki
2012-12-20 1:53 ` [PATCH 8/16] ACPI: Remove acpi_start_single_object() and acpi_bus_start() Rafael J. Wysocki
2012-12-20 1:54 ` [PATCH 9/16] ACPI: Remove the arguments of acpi_bus_add() that are not used Rafael J. Wysocki
2012-12-20 1:54 ` [PATCH 10/16] ACPI: Drop the second argument of acpi_bus_scan() Rafael J. Wysocki
2012-12-20 1:55 ` [PATCH 11/16] ACPI: Replace ACPI device add_type field with a match_driver flag Rafael J. Wysocki
2012-12-20 1:56 ` [PATCH 12/16] ACPI: Make acpi_bus_scan() and acpi_bus_add() take only one argument Rafael J. Wysocki
2012-12-20 1:57 ` [PATCH 13/16] ACPI: Add .setup() and .cleanup() callbacks to struct acpi_bus_type Rafael J. Wysocki
2012-12-20 1:58 ` [PATCH 14/16] ACPI / PCI: Rework the setup and cleanup of device wakeup Rafael J. Wysocki
2012-12-20 1:59 ` [PATCH 15/16] ACPI / PCI: Move the _PRT setup and cleanup code to pci-acpi.c Rafael J. Wysocki
2012-12-20 2:06 ` [PATCH 0/16] ACPI: Rework ACPI namespace scanning for devices Yinghai Lu
2012-12-21 0:09 ` Rafael J. Wysocki
2012-12-21 3:59 ` Yinghai Lu
2012-12-21 22:23 ` Rafael J. Wysocki
2012-12-20 21:07 ` Toshi Kani
2012-12-20 23:20 ` Rafael J. Wysocki
2012-12-13 22:18 ` [PATCH rev.2 2/6] ACPI: Change the ordering of PCI root bridge driver registrarion Rafael J. Wysocki
2012-12-13 22:21 ` [PATCH rev.2 3/6] ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different Rafael J. Wysocki
2012-12-13 22:21 ` [PATCH rev.2 4/6] ACPI: Reduce the usage of struct acpi_bus_ops Rafael J. Wysocki
2012-12-13 22:22 ` [PATCH rev.2 5/6] ACPI: Replace struct acpi_bus_ops with enum type Rafael J. Wysocki
2012-12-13 22:23 ` [PATCH rev.2 6/6] ACPI: Change the ordering of acpi_bus_check_add() Rafael J. Wysocki
2012-12-14 9:56 ` [PATCH rev.2 0/6] ACPI: Change the ACPI namespace scanning code ordering Yijing Wang
2012-12-14 22:59 ` Rafael J. Wysocki
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=1693581.lT8eSoGRfL@vostro.rjw.lan \
--to=rjw@sisk.pl \
--cc=bhelgaas@google.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=myron.stowe@redhat.com \
--cc=toshi.kani@hp.com \
--cc=yinghai@kernel.org \
/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).