Commit ba7e34b1 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds

include/linux/efi.h: redefine type, constant, macro from generic code

Generic UUID library defines structure type, macro to define UUID, and
the length of the UUID string.  This patch removes duplicate data
structure definition, UUID string length constant as well as macro for
UUID handling.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ede9c277
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/pfn.h> #include <linux/pfn.h>
#include <linux/pstore.h> #include <linux/pstore.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/uuid.h>
#include <linux/screen_info.h> #include <linux/screen_info.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -44,17 +45,10 @@ typedef u16 efi_char16_t; /* UNICODE character */ ...@@ -44,17 +45,10 @@ typedef u16 efi_char16_t; /* UNICODE character */
typedef u64 efi_physical_addr_t; typedef u64 efi_physical_addr_t;
typedef void *efi_handle_t; typedef void *efi_handle_t;
typedef uuid_le efi_guid_t;
typedef struct {
u8 b[16];
} efi_guid_t;
#define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \ #define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
((efi_guid_t) \ UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)
{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
(b) & 0xff, ((b) >> 8) & 0xff, \
(c) & 0xff, ((c) >> 8) & 0xff, \
(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
/* /*
* Generic EFI table header * Generic EFI table header
...@@ -1117,7 +1111,7 @@ extern int efi_status_to_err(efi_status_t status); ...@@ -1117,7 +1111,7 @@ extern int efi_status_to_err(efi_status_t status);
* Length of a GUID string (strlen("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")) * Length of a GUID string (strlen("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"))
* not including trailing NUL * not including trailing NUL
*/ */
#define EFI_VARIABLE_GUID_LEN 36 #define EFI_VARIABLE_GUID_LEN UUID_STRING_LEN
/* /*
* The type of search to perform when calling boottime->locate_handle * The type of search to perform when calling boottime->locate_handle
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment