Skip to contentSkip to conversation

Minor _OSC error handling improvements

PATCH New Andy Lutomirski 1 participant 3 messages Dec 15, 2015

Subsystems (2)
ACPI PCI
lore
Share & tools
lore

Andy Lutomirski

author
#0 lore raw

v2 cover Minor _OSC error handling improvements

This time, I think I'm sending to the right people.

This doesn't fix any bugs, but it makes the debugging output a little more useful.

Changes from v1:
- Added Bjorn's acks
- Split an overly long line

Andy Lutomirski (2):
acpi: Tidy up _OSC error spacing
acpi: Show _OSC UUID when _OSC fails

 drivers/acpi/bus.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH v2 1/2 acpi: Tidy up _OSC error spacing

The whitespace in _OSC error reports is weird. Improve it.

Acked-by Bjorn Helgaas <[email protected]>
Signed-off-by Andy Lutomirski <[email protected]>
---
 drivers/acpi/bus.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/acpi/bus.c +3 -3
index a212cefae524..2177ef0b16e4 100644
@@ -182,12 +182,12 @@ static void acpi_print_osc_error(acpi_handle handle,
 	if (ACPI_FAILURE(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer)))
 		printk(KERN_DEBUG "%s\n", error);
 	else {
-		printk(KERN_DEBUG "%s:%s\n", (char *)buffer.pointer, error);
+		printk(KERN_DEBUG "%s: %s\n", (char *)buffer.pointer, error);
 		kfree(buffer.pointer);
 	}
-	printk(KERN_DEBUG"_OSC request data:");
+	printk(KERN_DEBUG "_OSC request data:");
 	for (i = 0; i < context->cap.length; i += sizeof(u32))
-		printk("%x ", *((u32 *)(context->cap.pointer + i)));
+		printk(" %x", *((u32 *)(context->cap.pointer + i)));
 	printk("\n");
 }
Signature · 1 line
2.5.0
author
#2 lore raw

PATCH v2 2/2 acpi: Show _OSC UUID when _OSC fails

In reply to Andy Lutomirski

When _OSC fails and especially when it fails due to an invalid UUID, it's helpful to show the UUID that we tried.

Acked-by Bjorn Helgaas <[email protected]>
Signed-off-by Andy Lutomirski <[email protected]>
---
 drivers/acpi/bus.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/acpi/bus.c +3 -2
index 2177ef0b16e4..fcfdf6cbc6a8 100644
@@ -180,9 +180,10 @@ static void acpi_print_osc_error(acpi_handle handle,
 	int i;
 
 	if (ACPI_FAILURE(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer)))
-		printk(KERN_DEBUG "%s\n", error);
+		printk(KERN_DEBUG "%s: %s\n", context->uuid_str, error);
 	else {
-		printk(KERN_DEBUG "%s: %s\n", (char *)buffer.pointer, error);
+		printk(KERN_DEBUG "%s (%s): %s\n",
+		       (char *)buffer.pointer, context->uuid_str, error);
 		kfree(buffer.pointer);
 	}
 	printk(KERN_DEBUG "_OSC request data:");
Signature · 1 line
2.5.0