| Message ID | 1439273796-25359-8-git-send-email-jlee@suse.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Tue, 11 Aug, at 02:16:27PM, Lee, Chun-Yi wrote: > Moved the function of transferring EFI status to kernel error for > later used by EFI stub. Might I suggest: "Move the function for converting EFI status to kernel error values from drivers/firmware/efi/ to include/linux/efi.h for use by the x86 EFI stub in an upcoming patch." ? > Reviewed-by: Jiri Kosina <jkosina@suse.com> > Tested-by: Jiri Kosina <jkosina@suse.com> > Signed-off-by: Lee, Chun-Yi <jlee@suse.com> > --- > drivers/firmware/efi/vars.c | 33 --------------------------------- > include/linux/efi.h | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 33 insertions(+), 33 deletions(-) The patch content is fine, Reviewed-by: Matt Fleming <matt.fleming@intel.com>
On Thu, Aug 20, 2015 at 04:07:06PM +0100, Matt Fleming wrote: > On Tue, 11 Aug, at 02:16:27PM, Lee, Chun-Yi wrote: > > Moved the function of transferring EFI status to kernel error for > > later used by EFI stub. > > Might I suggest: > > "Move the function for converting EFI status to kernel error values > from drivers/firmware/efi/ to include/linux/efi.h for use by the x86 > EFI stub in an upcoming patch." > > ? > Thanks for your suggestion, I will follow it. > > Reviewed-by: Jiri Kosina <jkosina@suse.com> > > Tested-by: Jiri Kosina <jkosina@suse.com> > > Signed-off-by: Lee, Chun-Yi <jlee@suse.com> > > --- > > drivers/firmware/efi/vars.c | 33 --------------------------------- > > include/linux/efi.h | 33 +++++++++++++++++++++++++++++++++ > > 2 files changed, 33 insertions(+), 33 deletions(-) > > The patch content is fine, > > Reviewed-by: Matt Fleming <matt.fleming@intel.com> > Thanks > -- > Matt Fleming, Intel Open Source Technology Center Joey Lee -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c index 70a0fb1..f5ede94 100644 --- a/drivers/firmware/efi/vars.c +++ b/drivers/firmware/efi/vars.c @@ -237,39 +237,6 @@ check_var_size(u32 attributes, unsigned long size) return fops->query_variable_store(attributes, size); } -static int efi_status_to_err(efi_status_t status) -{ - int err; - - switch (status) { - case EFI_SUCCESS: - err = 0; - break; - case EFI_INVALID_PARAMETER: - err = -EINVAL; - break; - case EFI_OUT_OF_RESOURCES: - err = -ENOSPC; - break; - case EFI_DEVICE_ERROR: - err = -EIO; - break; - case EFI_WRITE_PROTECTED: - err = -EROFS; - break; - case EFI_SECURITY_VIOLATION: - err = -EACCES; - break; - case EFI_NOT_FOUND: - err = -ENOENT; - break; - default: - err = -EINVAL; - } - - return err; -} - static bool variable_is_present(efi_char16_t *variable_name, efi_guid_t *vendor, struct list_head *head) { diff --git a/include/linux/efi.h b/include/linux/efi.h index 8914d60..44a127b 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -874,6 +874,39 @@ efi_guid_to_str(efi_guid_t *guid, char *out) return out; } +static inline int efi_status_to_err(efi_status_t status) +{ + int err; + + switch (status) { + case EFI_SUCCESS: + err = 0; + break; + case EFI_INVALID_PARAMETER: + err = -EINVAL; + break; + case EFI_OUT_OF_RESOURCES: + err = -ENOSPC; + break; + case EFI_DEVICE_ERROR: + err = -EIO; + break; + case EFI_WRITE_PROTECTED: + err = -EROFS; + break; + case EFI_SECURITY_VIOLATION: + err = -EACCES; + break; + case EFI_NOT_FOUND: + err = -ENOENT; + break; + default: + err = -EINVAL; + } + + return err; +} + extern void efi_init (void); extern void *efi_get_pal_addr (void); extern void efi_map_pal_code (void);