Subject: [PATCH] [acpi driver model] Rename some functions in drivers/acpi/scan.c - We want the names 'acpi_device_{,un}register()' and since they are declared static and only used a handful of times, simply rename them. Signed-off-by: Patrick Mochel --- drivers/acpi/scan.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) applies-to: 0f40104468e56b0de4109942aae465d6d060e323 b5d45e6b75eb1c5a61b8c20ba203b4a7b5cc4c05 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 31218e1..e4696d7 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -111,7 +111,7 @@ static struct kset acpi_namespace_kset = .hotplug_ops = &namespace_hotplug_ops, }; -static void acpi_device_register(struct acpi_device *device, +static void acpi_register_device(struct acpi_device *device, struct acpi_device *parent) { /* @@ -143,7 +143,7 @@ static void acpi_device_register(struct create_sysfs_device_files(device); } -static int acpi_device_unregister(struct acpi_device *device, int type) +static int acpi_unregister_device(struct acpi_device *device, int type) { spin_lock(&acpi_device_lock); if (device->parent) { @@ -975,7 +975,7 @@ static int acpi_bus_remove(struct acpi_d dev->parent->ops.unbind(dev); } - acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT); + acpi_unregister_device(dev, ACPI_BUS_REMOVAL_EJECT); return_VALUE(0); } @@ -1087,7 +1087,7 @@ acpi_add_single_object(struct acpi_devic acpi_device_get_debug_info(device, handle, type); - acpi_device_register(device, parent); + acpi_register_device(device, parent); /* * Bind _ADR-Based Devices @@ -1397,7 +1397,7 @@ static int __init acpi_scan_init(void) } if (result) - acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL); + acpi_unregister_device(acpi_root, ACPI_BUS_REMOVAL_NORMAL); Done: return_VALUE(result); --- 0.99.9.GIT