From: Len Brown <len.brown@intel.com>
Date: Sat, 3 Feb 2007 06:39:07 +0000 (-0500)
Subject: Pull trivial into test branch
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=6b259707d53f0f25f0b24318a0774f1ae7e7e92c;p=linux-edison.git

Pull trivial into test branch

Conflicts:

	drivers/acpi/scan.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

6b259707d53f0f25f0b24318a0774f1ae7e7e92c
diff --cc drivers/acpi/scan.c
index 0a13d954dae,2e0fc8c3b58..64f26db10c8
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -989,51 -888,12 +989,8 @@@ static int acpi_device_set_context(stru
  	return result;
  }
  
- static void acpi_device_get_debug_info(struct acpi_device *device,
- 				       acpi_handle handle, int type)
- {
- #ifdef CONFIG_ACPI_DEBUG_OUTPUT
- 	char *type_string = NULL;
- 	char name[80] = { '?', '\0' };
- 	struct acpi_buffer buffer = { sizeof(name), name };
- 
- 	switch (type) {
- 	case ACPI_BUS_TYPE_DEVICE:
- 		type_string = "Device";
- 		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
- 		break;
- 	case ACPI_BUS_TYPE_POWER:
- 		type_string = "Power Resource";
- 		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
- 		break;
- 	case ACPI_BUS_TYPE_PROCESSOR:
- 		type_string = "Processor";
- 		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
- 		break;
- 	case ACPI_BUS_TYPE_SYSTEM:
- 		type_string = "System";
- 		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
- 		break;
- 	case ACPI_BUS_TYPE_THERMAL:
- 		type_string = "Thermal Zone";
- 		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
- 		break;
- 	case ACPI_BUS_TYPE_POWER_BUTTON:
- 		type_string = "Power Button";
- 		sprintf(name, "PWRB");
- 		break;
- 	case ACPI_BUS_TYPE_SLEEP_BUTTON:
- 		type_string = "Sleep Button";
- 		sprintf(name, "SLPB");
- 		break;
- 	}
- 
- 	printk(KERN_DEBUG "Found %s %s [%p]\n", type_string, name, handle);
- #endif				/*CONFIG_ACPI_DEBUG_OUTPUT */
- }
- 
  static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
  {
 -	int result = 0;
 -	struct acpi_driver *driver;
 -
 -
  	if (!dev)
  		return -EINVAL;
  
@@@ -1161,12 -1033,14 +1118,10 @@@ acpi_add_single_object(struct acpi_devi
  	if ((result = acpi_device_set_context(device, type)))
  		goto end;
  
- 	acpi_device_get_debug_info(device, handle, type);
- 
 -	acpi_device_register(device, parent);
 +	result = acpi_device_register(device, parent);
  
  	/*
 -	 * Bind _ADR-Based Devices
 -	 * -----------------------
 -	 * If there's a a bus address (_ADR) then we utilize the parent's 
 -	 * 'bind' function (if exists) to bind the ACPI- and natively-
 -	 * enumerated device representations.
 +	 * Bind _ADR-Based Devices when hot add
  	 */
  	if (device->flags.bus_address) {
  		if (device->parent && device->parent->ops.bind)