Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b259707 authored by Len Brown's avatar Len Brown
Browse files

Pull trivial into test branch 



Conflicts:

	drivers/acpi/scan.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents a4144e45 db503422

drivers/acpi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#



menu "ACPI (Advanced Configuration and Power Interface) Support"

	depends on !X86_NUMAQ

	depends on !X86_VISWS

	depends on !IA64_HP_SIM

	depends on IA64 || X86

drivers/acpi/scan.c

+0 −45
Original line number Diff line number Diff line
@@ -989,49 +989,6 @@ static int acpi_device_set_context(struct acpi_device *device, int type) 
	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)

{

	if (!dev)
@@ -1161,8 +1118,6 @@ acpi_add_single_object(struct acpi_device **child, 
	if ((result = acpi_device_set_context(device, type)))

		goto end;



	acpi_device_get_debug_info(device, handle, type);



	result = acpi_device_register(device, parent);



	/*