hp-wmi: remove a variable that is never read

[deliverable/linux.git] / drivers / platform / x86 / hp-wmi.c

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 9e05af9c41cbcd129bc3912c4bff2b6b8ad61b96..8e27c27900a3780567b11fe77618a4b332fb65b1 100644 (file)
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -89,6 +89,13 @@ struct bios_return {
        u32 value;
 };
 
+enum hp_return_value {
+       HPWMI_RET_WRONG_SIGNATURE       = 0x02,
+       HPWMI_RET_UNKNOWN_COMMAND       = 0x03,
+       HPWMI_RET_UNKNOWN_CMDTYPE       = 0x04,
+       HPWMI_RET_INVALID_PARAMETERS    = 0x05,
+};
+
 static const struct key_entry hp_wmi_keymap[] = {
        { KE_KEY, 0x02,   { KEY_BRIGHTNESSUP } },
        { KE_KEY, 0x03,   { KEY_BRIGHTNESSDOWN } },
@@ -146,7 +153,6 @@ static int hp_wmi_perform_query(int query, int write, u32 *buffer,
                                int buffersize)
 {
        struct bios_return bios_return;
-       acpi_status status;
        union acpi_object *obj;
        struct bios_args args = {
                .signature = 0x55434553,
@@ -158,7 +164,7 @@ static int hp_wmi_perform_query(int query, int write, u32 *buffer,
        struct acpi_buffer input = { sizeof(struct bios_args), &args };
        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
 
-       status = wmi_evaluate_method(HPWMI_BIOS_GUID, 0, 0x3, &input, &output);
+       wmi_evaluate_method(HPWMI_BIOS_GUID, 0, 0x3, &input, &output);
 
        obj = output.pointer;
 
@@ -171,6 +177,15 @@ static int hp_wmi_perform_query(int query, int write, u32 *buffer,
 
        bios_return = *((struct bios_return *)obj->buffer.pointer);
 
+       if (bios_return.return_code) {
+               if (bios_return.return_code != HPWMI_RET_UNKNOWN_CMDTYPE)
+                       printk(KERN_WARNING PREFIX "query 0x%x returned "
+                                                  "error 0x%x\n",
+                              query, bios_return.return_code);
+               kfree(obj);
+               return bios_return.return_code;
+       }
+
        memcpy(buffer, &bios_return.value, sizeof(bios_return.value));
 
        kfree(obj);