compat: Cleanup in_compat_syscall() callers

[linux-2.6-block.git] / drivers / firmware / efi / efivars.c

diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
index 3e626fd9bd4e1fafe6e0f4da4597ed66a978bd08..8061667a6765aeb6752a50c134edf60414e7d652 100644 (file)
--- a/drivers/firmware/efi/efivars.c
+++ b/drivers/firmware/efi/efivars.c
@@ -229,14 +229,6 @@ sanity_check(struct efi_variable *var, efi_char16_t *name, efi_guid_t vendor,
        return 0;
 }
 
-static inline bool is_compat(void)
-{
-       if (IS_ENABLED(CONFIG_COMPAT) && in_compat_syscall())
-               return true;
-
-       return false;
-}
-
 static void
 copy_out_compat(struct efi_variable *dst, struct compat_efi_variable *src)
 {
@@ -263,7 +255,7 @@ efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count)
        u8 *data;
        int err;
 
-       if (is_compat()) {
+       if (in_compat_syscall()) {
                struct compat_efi_variable *compat;
 
                if (count != sizeof(*compat))
@@ -324,7 +316,7 @@ efivar_show_raw(struct efivar_entry *entry, char *buf)
                             &entry->var.DataSize, entry->var.Data))
                return -EIO;
 
-       if (is_compat()) {
+       if (in_compat_syscall()) {
                compat = (struct compat_efi_variable *)buf;
 
                size = sizeof(*compat);
@@ -418,7 +410,7 @@ static ssize_t efivar_create(struct file *filp, struct kobject *kobj,
        struct compat_efi_variable *compat = (struct compat_efi_variable *)buf;
        struct efi_variable *new_var = (struct efi_variable *)buf;
        struct efivar_entry *new_entry;
-       bool need_compat = is_compat();
+       bool need_compat = in_compat_syscall();
        efi_char16_t *name;
        unsigned long size;
        u32 attributes;
@@ -495,7 +487,7 @@ static ssize_t efivar_delete(struct file *filp, struct kobject *kobj,
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       if (is_compat()) {
+       if (in_compat_syscall()) {
                if (count != sizeof(*compat))
                        return -EINVAL;