From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Yinghai Lu <yinghai@kernel.org>, Toshi Kani <toshi.kani@hp.com>,
Yijing Wang <wangyijing0307@gmail.com>,
Jiang Liu <liuj97@gmail.com>, Wen Congyang <wency@cn.fujitsu.com>
Subject: [PATCH 4/6] ACPI: Drop the second argument of acpi_bus_scan()
Date: Sun, 16 Dec 2012 14:52:35 +0100 [thread overview]
Message-ID: <1678273.jPdHqatAlf@vostro.rjw.lan> (raw)
In-Reply-To: <4532917.9APhB4xTvi@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
After the removal of acpi_start_single_object() and acpi_bus_start()
the second argument of acpi_bus_scan() is not necessary any more,
so drop it and update acpi_bus_check_add() accordingly.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/scan.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
Index: linux/drivers/acpi/scan.c
===================================================================
--- linux.orig/drivers/acpi/scan.c
+++ linux/drivers/acpi/scan.c
@@ -1592,8 +1592,8 @@ static int acpi_bus_type_and_status(acpi
return 0;
}
-static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
- void *context, void **return_value)
+static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ void *not_used, void **return_value)
{
struct acpi_device *device = NULL;
int type;
@@ -1625,7 +1625,7 @@ static acpi_status acpi_bus_check_add(ac
if (!device)
return AE_CTRL_DEPTH;
- device->add_type = context ? ACPI_BUS_ADD_START : ACPI_BUS_ADD_MATCH;
+ device->add_type = ACPI_BUS_ADD_START;
out:
if (!*return_value)
@@ -1664,18 +1664,16 @@ static acpi_status acpi_bus_device_attac
return status;
}
-static int acpi_bus_scan(acpi_handle handle, bool start,
- struct acpi_device **child)
+static int acpi_bus_scan(acpi_handle handle, struct acpi_device **child)
{
void *device = NULL;
acpi_status status;
int ret = -ENODEV;
- status = acpi_bus_check_add(handle, 0, (void *)start, &device);
+ status = acpi_bus_check_add(handle, 0, NULL, &device);
if (ACPI_SUCCESS(status))
acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
- acpi_bus_check_add, NULL, (void *)start,
- &device);
+ acpi_bus_check_add, NULL, NULL, &device);
if (!device)
goto out;
@@ -1719,7 +1717,7 @@ int acpi_bus_add(acpi_handle handle, str
{
int err;
- err = acpi_bus_scan(handle, false, ret);
+ err = acpi_bus_scan(handle, ret);
if (err)
return err;
@@ -1825,7 +1823,7 @@ int __init acpi_scan_init(void)
/*
* Enumerate devices in the ACPI namespace.
*/
- result = acpi_bus_scan(ACPI_ROOT_OBJECT, true, &acpi_root);
+ result = acpi_bus_scan(ACPI_ROOT_OBJECT, &acpi_root);
if (!result)
result = acpi_bus_scan_fixed();
next prev parent reply other threads:[~2012-12-16 13:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-16 13:47 [PATCH 0/6] ACPI: Simplify namespace scanning for devices Rafael J. Wysocki
2012-12-16 13:49 ` [PATCH 1/6] ACPI / PCI: Fold acpi_pci_root_start() into acpi_pci_root_add() Rafael J. Wysocki
2012-12-16 13:51 ` [PATCH 2/6] ACPI: Remove acpi_start_single_object() and acpi_bus_start() Rafael J. Wysocki
2012-12-16 13:51 ` [PATCH 3/6] ACPI: Remove the arguments of acpi_bus_add() that are not used Rafael J. Wysocki
2012-12-16 13:52 ` Rafael J. Wysocki [this message]
2012-12-16 13:53 ` [PATCH 5/6] ACPI: Replace ACPI device add_type field with a match_driver flag Rafael J. Wysocki
2012-12-16 13:55 ` [PATCH 6/6] ACPI: Make acpi_bus_scan() and acpi_bus_add() take only one argument Rafael J. Wysocki
2012-12-16 15:59 ` [PATCH 0/6] ACPI: Simplify namespace scanning for devices Jiang Liu
2012-12-16 22:29 ` Rafael J. Wysocki
2012-12-16 17:36 ` Yinghai Lu
2012-12-16 22:31 ` Rafael J. Wysocki
2012-12-17 7:00 ` Yinghai Lu
2012-12-17 7:51 ` 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=1678273.jPdHqatAlf@vostro.rjw.lan \
--to=rjw@sisk.pl \
--cc=bhelgaas@google.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuj97@gmail.com \
--cc=toshi.kani@hp.com \
--cc=wangyijing0307@gmail.com \
--cc=wency@cn.fujitsu.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).