Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / firmware / efi / runtime-wrappers.c

diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c
index e2abfdb5cee6a2339e73ba6ec753dce1f83b2dbd..698745c249e8cce1c526507072c9eb4dc307da0b 100644 (file)
--- a/drivers/firmware/efi/runtime-wrappers.c
+++ b/drivers/firmware/efi/runtime-wrappers.c
@@ -85,7 +85,7 @@ struct efi_runtime_work efi_rts_work;
                pr_err("Failed to queue work to efi_rts_wq.\n");        \
                                                                        \
 exit:                                                                  \
-       efi_rts_work.efi_rts_id = NONE;                                 \
+       efi_rts_work.efi_rts_id = EFI_NONE;                             \
        efi_rts_work.status;                                            \
 })
 
@@ -175,50 +175,50 @@ static void efi_call_rts(struct work_struct *work)
        arg5 = efi_rts_work.arg5;
 
        switch (efi_rts_work.efi_rts_id) {
-       case GET_TIME:
+       case EFI_GET_TIME:
                status = efi_call_virt(get_time, (efi_time_t *)arg1,
                                       (efi_time_cap_t *)arg2);
                break;
-       case SET_TIME:
+       case EFI_SET_TIME:
                status = efi_call_virt(set_time, (efi_time_t *)arg1);
                break;
-       case GET_WAKEUP_TIME:
+       case EFI_GET_WAKEUP_TIME:
                status = efi_call_virt(get_wakeup_time, (efi_bool_t *)arg1,
                                       (efi_bool_t *)arg2, (efi_time_t *)arg3);
                break;
-       case SET_WAKEUP_TIME:
+       case EFI_SET_WAKEUP_TIME:
                status = efi_call_virt(set_wakeup_time, *(efi_bool_t *)arg1,
                                       (efi_time_t *)arg2);
                break;
-       case GET_VARIABLE:
+       case EFI_GET_VARIABLE:
                status = efi_call_virt(get_variable, (efi_char16_t *)arg1,
                                       (efi_guid_t *)arg2, (u32 *)arg3,
                                       (unsigned long *)arg4, (void *)arg5);
                break;
-       case GET_NEXT_VARIABLE:
+       case EFI_GET_NEXT_VARIABLE:
                status = efi_call_virt(get_next_variable, (unsigned long *)arg1,
                                       (efi_char16_t *)arg2,
                                       (efi_guid_t *)arg3);
                break;
-       case SET_VARIABLE:
+       case EFI_SET_VARIABLE:
                status = efi_call_virt(set_variable, (efi_char16_t *)arg1,
                                       (efi_guid_t *)arg2, *(u32 *)arg3,
                                       *(unsigned long *)arg4, (void *)arg5);
                break;
-       case QUERY_VARIABLE_INFO:
+       case EFI_QUERY_VARIABLE_INFO:
                status = efi_call_virt(query_variable_info, *(u32 *)arg1,
                                       (u64 *)arg2, (u64 *)arg3, (u64 *)arg4);
                break;
-       case GET_NEXT_HIGH_MONO_COUNT:
+       case EFI_GET_NEXT_HIGH_MONO_COUNT:
                status = efi_call_virt(get_next_high_mono_count, (u32 *)arg1);
                break;
-       case UPDATE_CAPSULE:
+       case EFI_UPDATE_CAPSULE:
                status = efi_call_virt(update_capsule,
                                       (efi_capsule_header_t **)arg1,
                                       *(unsigned long *)arg2,
                                       *(unsigned long *)arg3);
                break;
-       case QUERY_CAPSULE_CAPS:
+       case EFI_QUERY_CAPSULE_CAPS:
                status = efi_call_virt(query_capsule_caps,
                                       (efi_capsule_header_t **)arg1,
                                       *(unsigned long *)arg2, (u64 *)arg3,
@@ -242,7 +242,7 @@ static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(GET_TIME, tm, tc, NULL, NULL, NULL);
+       status = efi_queue_work(EFI_GET_TIME, tm, tc, NULL, NULL, NULL);
        up(&efi_runtime_lock);
        return status;
 }
@@ -253,7 +253,7 @@ static efi_status_t virt_efi_set_time(efi_time_t *tm)
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(SET_TIME, tm, NULL, NULL, NULL, NULL);
+       status = efi_queue_work(EFI_SET_TIME, tm, NULL, NULL, NULL, NULL);
        up(&efi_runtime_lock);
        return status;
 }
@@ -266,7 +266,7 @@ static efi_status_t virt_efi_get_wakeup_time(efi_bool_t *enabled,
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(GET_WAKEUP_TIME, enabled, pending, tm, NULL,
+       status = efi_queue_work(EFI_GET_WAKEUP_TIME, enabled, pending, tm, NULL,
                                NULL);
        up(&efi_runtime_lock);
        return status;
@@ -278,7 +278,7 @@ static efi_status_t virt_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(SET_WAKEUP_TIME, &enabled, tm, NULL, NULL,
+       status = efi_queue_work(EFI_SET_WAKEUP_TIME, &enabled, tm, NULL, NULL,
                                NULL);
        up(&efi_runtime_lock);
        return status;
@@ -294,7 +294,7 @@ static efi_status_t virt_efi_get_variable(efi_char16_t *name,
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(GET_VARIABLE, name, vendor, attr, data_size,
+       status = efi_queue_work(EFI_GET_VARIABLE, name, vendor, attr, data_size,
                                data);
        up(&efi_runtime_lock);
        return status;
@@ -308,7 +308,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size,
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(GET_NEXT_VARIABLE, name_size, name, vendor,
+       status = efi_queue_work(EFI_GET_NEXT_VARIABLE, name_size, name, vendor,
                                NULL, NULL);
        up(&efi_runtime_lock);
        return status;
@@ -324,7 +324,7 @@ static efi_status_t virt_efi_set_variable(efi_char16_t *name,
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(SET_VARIABLE, name, vendor, &attr, &data_size,
+       status = efi_queue_work(EFI_SET_VARIABLE, name, vendor, &attr, &data_size,
                                data);
        up(&efi_runtime_lock);
        return status;
@@ -359,7 +359,7 @@ static efi_status_t virt_efi_query_variable_info(u32 attr,
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(QUERY_VARIABLE_INFO, &attr, storage_space,
+       status = efi_queue_work(EFI_QUERY_VARIABLE_INFO, &attr, storage_space,
                                remaining_space, max_variable_size, NULL);
        up(&efi_runtime_lock);
        return status;
@@ -391,7 +391,7 @@ static efi_status_t virt_efi_get_next_high_mono_count(u32 *count)
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(GET_NEXT_HIGH_MONO_COUNT, count, NULL, NULL,
+       status = efi_queue_work(EFI_GET_NEXT_HIGH_MONO_COUNT, count, NULL, NULL,
                                NULL, NULL);
        up(&efi_runtime_lock);
        return status;
@@ -407,7 +407,7 @@ static void virt_efi_reset_system(int reset_type,
                        "could not get exclusive access to the firmware\n");
                return;
        }
-       efi_rts_work.efi_rts_id = RESET_SYSTEM;
+       efi_rts_work.efi_rts_id = EFI_RESET_SYSTEM;
        __efi_call_virt(reset_system, reset_type, status, data_size, data);
        up(&efi_runtime_lock);
 }
@@ -423,7 +423,7 @@ static efi_status_t virt_efi_update_capsule(efi_capsule_header_t **capsules,
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(UPDATE_CAPSULE, capsules, &count, &sg_list,
+       status = efi_queue_work(EFI_UPDATE_CAPSULE, capsules, &count, &sg_list,
                                NULL, NULL);
        up(&efi_runtime_lock);
        return status;
@@ -441,7 +441,7 @@ static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules,
 
        if (down_interruptible(&efi_runtime_lock))
                return EFI_ABORTED;
-       status = efi_queue_work(QUERY_CAPSULE_CAPS, capsules, &count,
+       status = efi_queue_work(EFI_QUERY_CAPSULE_CAPS, capsules, &count,
                                max_size, reset_type, NULL);
        up(&efi_runtime_lock);
        return status;