lkml.org 
[lkml]   [2012]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 10/16] ACPI: Drop the second argument of acpi_bus_scan()
Date
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>
Acked-by: Yinghai Lu <yinghai@kernel.org>
---
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;
acpi_hot_add_bind(device);

out:
@@ -1662,18 +1662,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;
@@ -1717,7 +1715,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;

@@ -1823,7 +1821,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();


\
 
 \ /
  Last update: 2012-12-20 03:21    [W:0.194 / U:0.280 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site