efi: Replace zero-length array and use struct_size() helper

[linux-2.6-microblaze.git] / include / linux / efi.h

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 2c6495f..c3449c9 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1236,14 +1236,11 @@ struct linux_efi_memreserve {
        struct {
                phys_addr_t     base;
                phys_addr_t     size;
-       } entry[0];
+       } entry[];
 };
 
-#define EFI_MEMRESERVE_SIZE(count) (sizeof(struct linux_efi_memreserve) + \
-       (count) * sizeof(((struct linux_efi_memreserve *)0)->entry[0]))
-
 #define EFI_MEMRESERVE_COUNT(size) (((size) - sizeof(struct linux_efi_memreserve)) \
-       / sizeof(((struct linux_efi_memreserve *)0)->entry[0]))
+       / sizeof_field(struct linux_efi_memreserve, entry[0]))
 
 void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);