From d5b0ba30b51497617fdc886a6f02901d427e1763 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 21 May 2010 16:18:11 +0200 Subject: [PATCH] --- yaml --- r: 202432 b: refs/heads/master c: a2806c6f00d851f11ef8725d78739d48a1ca2fe9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/hp-wmi.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0f0498e8170e..aa3952fc7d7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da9a79ba5873b0f1d4dc7711ea6a96be6b69341e +refs/heads/master: a2806c6f00d851f11ef8725d78739d48a1ca2fe9 diff --git a/trunk/drivers/platform/x86/hp-wmi.c b/trunk/drivers/platform/x86/hp-wmi.c index 7b086ddf7b2d..e04715abca20 100644 --- a/trunk/drivers/platform/x86/hp-wmi.c +++ b/trunk/drivers/platform/x86/hp-wmi.c @@ -52,6 +52,8 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4"); #define HPWMI_WIRELESS_QUERY 0x5 #define HPWMI_HOTKEY_QUERY 0xc +#define PREFIX "HP WMI: " + enum hp_wmi_radio { HPWMI_WIFI = 0, HPWMI_BLUETOOTH = 1, @@ -349,14 +351,14 @@ static void hp_wmi_notify(u32 value, void *context) status = wmi_get_event_data(value, &response); if (status != AE_OK) { - printk(KERN_INFO "hp-wmi: bad event status 0x%x\n", status); + printk(KERN_INFO PREFIX "bad event status 0x%x\n", status); return; } obj = (union acpi_object *)response.pointer; if (!obj || obj->type != ACPI_TYPE_BUFFER || obj->buffer.length != 8) { - printk(KERN_INFO "HP WMI: Unknown response received\n"); + printk(KERN_INFO PREFIX "Unknown response received\n"); kfree(obj); return; } @@ -387,7 +389,7 @@ static void hp_wmi_notify(u32 value, void *context) break; } } else - printk(KERN_INFO "HP WMI: Unknown key code - 0x%x\n", + printk(KERN_INFO PREFIX "Unknown key code - 0x%x\n", key_code); break; case HPWMI_WIRELESS: @@ -405,7 +407,7 @@ static void hp_wmi_notify(u32 value, void *context) hp_wmi_get_hw_state(HPWMI_WWAN)); break; default: - printk(KERN_INFO "HP WMI: Unknown eventcode - %d\n", + printk(KERN_INFO PREFIX "Unknown eventcode - %d\n", eventcode); break; }